From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeui/CMakeLists.txt | 2 +- kdeui/Mainpage.dox | 2 +- kdeui/TODO.kspell | 4 +- kdeui/TODO.xmlgui | 2 +- kdeui/colors/rgb.txt | 2 +- kdeui/kaboutapplication.h | 2 +- kdeui/kaboutdialog.cpp | 196 ++++++++++++------------ kdeui/kaboutdialog.h | 22 +-- kdeui/kaboutdialog_private.h | 4 +- kdeui/kaboutkde.cpp | 8 +- kdeui/kaccelgen.h | 14 +- kdeui/kaction.cpp | 32 ++-- kdeui/kaction.h | 6 +- kdeui/kactionclasses.cpp | 40 ++--- kdeui/kactionclasses.h | 4 +- kdeui/kactioncollection.cpp | 24 +-- kdeui/kactioncollection.h | 12 +- kdeui/kactivelabel.cpp | 8 +- kdeui/kactivelabel.h | 4 +- kdeui/kanimwidget.cpp | 8 +- kdeui/karrowbutton.cpp | 10 +- kdeui/karrowbutton.h | 8 +- kdeui/kauthicon.cpp | 30 ++-- kdeui/kauthicon.h | 12 +- kdeui/kbugreport.cpp | 74 ++++----- kdeui/kbuttonbox.cpp | 14 +- kdeui/kbuttonbox.h | 10 +- kdeui/kcharselect.cpp | 104 ++++++------- kdeui/kcharselect.h | 6 +- kdeui/kcmenumngr.cpp | 10 +- kdeui/kcmenumngr.h | 2 +- kdeui/kcmodule.h | 4 +- kdeui/kcolorbutton.cpp | 18 +-- kdeui/kcolorbutton.h | 2 +- kdeui/kcolorcombo.cpp | 8 +- kdeui/kcolorcombo.h | 2 +- kdeui/kcolordialog.cpp | 66 ++++----- kdeui/kcolordialog.h | 2 +- kdeui/kcolordrag.cpp | 10 +- kdeui/kcolordrag.h | 4 +- kdeui/kcombobox.cpp | 14 +- kdeui/kcombobox.h | 8 +- kdeui/kcommand.cpp | 18 +-- kdeui/kcommand.h | 2 +- kdeui/kcompletionbox.cpp | 26 ++-- kdeui/kcompletionbox.h | 6 +- kdeui/kconfigdialog.cpp | 2 +- kdeui/kcursor.cpp | 16 +- kdeui/kcursor.h | 2 +- kdeui/kcursor_private.h | 4 +- kdeui/kdatepicker.cpp | 28 ++-- kdeui/kdatepicker.h | 6 +- kdeui/kdatetbl.cpp | 74 ++++----- kdeui/kdatetbl.h | 8 +- kdeui/kdatetimewidget.cpp | 4 +- kdeui/kdatewidget.cpp | 10 +- kdeui/kdcopactionproxy.cpp | 2 +- kdeui/kdepackages.h | 16 +- kdeui/kdetrayproxy/kdetrayproxy.cpp | 16 +- kdeui/kdialog.cpp | 12 +- kdeui/kdialog.h | 24 +-- kdeui/kdialogbase.cpp | 184 +++++++++++------------ kdeui/kdialogbase.h | 96 ++++++------ kdeui/kdialogbase_priv.h | 2 +- kdeui/kdockwidget.cpp | 272 +++++++++++++++++----------------- kdeui/kdockwidget.h | 64 ++++---- kdeui/kdockwidget_private.cpp | 38 ++--- kdeui/kdockwidget_private.h | 6 +- kdeui/kdualcolorbutton.cpp | 40 ++--- kdeui/kdualcolorbutton.h | 4 +- kdeui/keditcl.h | 36 ++--- kdeui/keditcl1.cpp | 58 ++++---- kdeui/keditcl2.cpp | 230 ++++++++++++++-------------- kdeui/keditlistbox.cpp | 8 +- kdeui/kedittoolbar.cpp | 130 ++++++++-------- kdeui/kedittoolbar.h | 10 +- kdeui/kfontcombo.cpp | 6 +- kdeui/kfontdialog.cpp | 50 +++---- kdeui/kfontdialog.h | 8 +- kdeui/kfontrequester.cpp | 8 +- kdeui/kguiitem.cpp | 2 +- kdeui/khelpmenu.cpp | 4 +- kdeui/khelpmenu.h | 2 +- kdeui/kiconview.cpp | 34 ++--- kdeui/kiconview.h | 4 +- kdeui/kiconviewsearchline.cpp | 2 +- kdeui/kinputdialog.cpp | 66 ++++----- kdeui/kinputdialog.h | 10 +- kdeui/kjanuswidget.cpp | 76 +++++----- kdeui/kjanuswidget.h | 32 ++-- kdeui/kkeybutton.cpp | 16 +- kdeui/kkeydialog.cpp | 16 +- kdeui/klanguagebutton.cpp | 20 +-- kdeui/klanguagebutton.h | 4 +- kdeui/kled.cpp | 38 ++--- kdeui/kled.h | 24 +-- kdeui/klineedit.cpp | 70 ++++----- kdeui/klineeditdlg.cpp | 22 +-- kdeui/klineeditdlg.h | 2 +- kdeui/klistview.cpp | 90 +++++------ kdeui/klistview.h | 10 +- kdeui/klistviewsearchline.cpp | 12 +- kdeui/kmainwindow.cpp | 92 ++++++------ kdeui/kmainwindow.h | 50 +++---- kdeui/kmenubar.cpp | 66 ++++----- kdeui/kmenubar.h | 2 +- kdeui/kmessagebox.cpp | 38 ++--- kdeui/kmessagebox.h | 12 +- kdeui/knuminput.cpp | 96 ++++++------ kdeui/knuminput.h | 36 ++--- kdeui/knumvalidator.cpp | 30 ++-- kdeui/kpanelapplet.cpp | 16 +- kdeui/kpanelapplet.h | 20 +-- kdeui/kpanelextension.cpp | 10 +- kdeui/kpanelextension.h | 20 +-- kdeui/kpanelmenu.h | 4 +- kdeui/kpartgui.dtd | 2 +- kdeui/kpassdlg.cpp | 42 +++--- kdeui/kpassdlg.h | 4 +- kdeui/kpassivepopup.cpp | 22 +-- kdeui/kpassivepopup.h | 2 +- kdeui/kpixmapio.cpp | 98 ++++++------ kdeui/kpixmapregionselectorwidget.cpp | 2 +- kdeui/kpopupmenu.cpp | 28 ++-- kdeui/kpopupmenu.h | 2 +- kdeui/kprogress.cpp | 12 +- kdeui/kprogress.h | 6 +- kdeui/kprogressbox.cpp | 8 +- kdeui/kpushbutton.cpp | 2 +- kdeui/krestrictedline.cpp | 2 +- kdeui/krootpixmap.cpp | 28 ++-- kdeui/krootpixmap.h | 10 +- kdeui/kruler.cpp | 20 +-- kdeui/kruler.h | 8 +- kdeui/ksconfig.cpp | 32 ++-- kdeui/ksconfig.h | 16 +- kdeui/kselect.cpp | 36 ++--- kdeui/kselect.h | 8 +- kdeui/kseparator.cpp | 4 +- kdeui/kseparator.h | 2 +- kdeui/ksharedpixmap.cpp | 4 +- kdeui/kshortcutdialog.cpp | 4 +- kdeui/kshortcutdialog_advanced.ui | 14 +- kdeui/kshortcutdialog_simple.ui | 10 +- kdeui/kspell.cpp | 96 ++++++------ kdeui/kspell.h | 32 ++-- kdeui/kspelldlg.cpp | 58 ++++---- kdeui/kspelldlg.h | 8 +- kdeui/kspellui.ui | 36 ++--- kdeui/ksqueezedtextlabel.cpp | 16 +- kdeui/ksqueezedtextlabel.h | 8 +- kdeui/kstatusbar.cpp | 8 +- kdeui/kstatusbar.h | 10 +- kdeui/kstdaction.cpp | 20 +-- kdeui/kstdaction.h | 26 ++-- kdeui/kstdaction_p.h | 12 +- kdeui/kstdguiitem.cpp | 62 ++++---- kdeui/kstdguiitem.h | 4 +- kdeui/kstringvalidator.cpp | 6 +- kdeui/kswitchlanguagedialog.cpp | 2 +- kdeui/ksyntaxhighlighter.cpp | 26 ++-- kdeui/ksystemtray.cpp | 32 ++-- kdeui/ksystemtray.h | 4 +- kdeui/ktabbar.cpp | 34 ++--- kdeui/ktabctl.cpp | 50 +++---- kdeui/ktabctl.h | 4 +- kdeui/ktabwidget.cpp | 12 +- kdeui/ktextbrowser.cpp | 4 +- kdeui/ktextedit.cpp | 36 ++--- kdeui/ktimewidget.cpp | 4 +- kdeui/ktimezonewidget.cpp | 2 +- kdeui/ktip.cpp | 30 ++-- kdeui/ktoolbar.cpp | 122 +++++++-------- kdeui/ktoolbar.h | 20 +-- kdeui/ktoolbarbutton.cpp | 44 +++--- kdeui/ktoolbarbutton.h | 8 +- kdeui/ktoolbarhandler.cpp | 4 +- kdeui/ktoolbarlabelaction.cpp | 4 +- kdeui/ktoolbarlabelaction.h | 10 +- kdeui/ktoolbarradiogroup.cpp | 6 +- kdeui/ktoolbarradiogroup.h | 2 +- kdeui/kurllabel.cpp | 22 +-- kdeui/kurllabel.h | 6 +- kdeui/kwhatsthismanager.cpp | 12 +- kdeui/kwhatsthismanager_p.h | 2 +- kdeui/kwindowinfo.h | 2 +- kdeui/kwindowlistmenu.cpp | 2 +- kdeui/kwordwrap.cpp | 2 +- kdeui/kwordwrap.h | 4 +- kdeui/kxmlgui.xsd | 4 +- kdeui/kxmlguibuilder.cpp | 32 ++-- kdeui/kxmlguiclient.cpp | 50 +++---- kdeui/kxmlguiclient.h | 8 +- kdeui/kxmlguifactory.cpp | 28 ++-- kdeui/kxmlguifactory.h | 10 +- kdeui/kxmlguifactory_p.cpp | 62 ++++---- kdeui/kxmlguifactory_p.h | 14 +- kdeui/preparetips | 4 +- kdeui/qxembed.cpp | 140 ++++++++--------- kdeui/qxembed.h | 4 +- kdeui/tests/kblendtest.cpp | 2 +- kdeui/tests/kbuttonboxtest.cpp | 36 ++--- kdeui/tests/kcharselecttest.cpp | 2 +- kdeui/tests/kcolortest.cpp | 6 +- kdeui/tests/kcomboboxtest.cpp | 10 +- kdeui/tests/kcompletiontest.cpp | 10 +- kdeui/tests/kdesattest.cpp | 2 +- kdeui/tests/kdialogbasetest.cpp | 8 +- kdeui/tests/kdockwidgetdemo.cpp | 14 +- kdeui/tests/kdualcolortest.cpp | 14 +- kdeui/tests/keditlistboxtest.cpp | 12 +- kdeui/tests/kledtest.cpp | 6 +- kdeui/tests/kledtest.h | 2 +- kdeui/tests/klineedittest.cpp | 6 +- kdeui/tests/kmessageboxtest.cpp | 34 ++--- kdeui/tests/kpanelmenutest.cpp | 2 +- kdeui/tests/kpopuptest.cpp | 2 +- kdeui/tests/krulertest.cpp | 24 +-- kdeui/tests/krulertest.h | 2 +- kdeui/tests/ktabwidgettest.cpp | 26 ++-- kdeui/tests/kunbalancedgrdtest.cpp | 2 +- kdeui/tests/kwizardtest.cpp | 6 +- kdeui/ui_standards.rc | 12 +- 223 files changed, 2663 insertions(+), 2663 deletions(-) (limited to 'kdeui') diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 7597b0f69..4003f02a5 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -150,7 +150,7 @@ set( ${target}_SRCS ktoolbarlabelaction.cpp ) -tde_add_library( ${target} SHARED AUTOTQMOC +tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} diff --git a/kdeui/Mainpage.dox b/kdeui/Mainpage.dox index 1961e82ed..bf6f6596d 100644 --- a/kdeui/Mainpage.dox +++ b/kdeui/Mainpage.dox @@ -35,7 +35,7 @@ * KSpell usually works asynchronously. If you do not need that, you should * simply use KSpell::modalCheck(). It won't return until the * passed string is processed or the spell checking canceled. -* During modal spell checking your GUI is still tqrepainted, but the user may +* During modal spell checking your GUI is still repainted, but the user may * only interact with the KSpell dialog. * * @see KSpell, KSpellConfig diff --git a/kdeui/TODO.kspell b/kdeui/TODO.kspell index f68e156d3..99c9df408 100644 --- a/kdeui/TODO.kspell +++ b/kdeui/TODO.kspell @@ -22,10 +22,10 @@ old todo from David Sweet properly handle capitalization on "Replace All" (in parseOneResponse()) -ensure that KSpell is reusable with the same tqreplace/ignore lists +ensure that KSpell is reusable with the same replace/ignore lists for multiple spellchecks in a single editing session -allow saving of ignore/tqreplace lists for multiple spellchecks of a +allow saving of ignore/replace lists for multiple spellchecks of a given document across multiple sessions add a "move()" function to move the dialog box (calling app should use this diff --git a/kdeui/TODO.xmlgui b/kdeui/TODO.xmlgui index dd41a785a..3c3d4f8a4 100644 --- a/kdeui/TODO.xmlgui +++ b/kdeui/TODO.xmlgui @@ -41,7 +41,7 @@ So ui_standards.rc needs to be turned into s and s only like separators and tearoffhandle etc.) in a container, in which case it should not appear in the GUI. For that, ContainerNode must be improved so that it supports having no real GUI container attached to it. -Big problem here. This means not building a container until we tqfind that it +Big problem here. This means not building a container until we find that it really has an action (and the other way round: deleting a container when removing its last action, as we do, but still keeping a ContainerNode around...) (A ContainerNode is destroyed when its owner guiclient is removed from the factory, diff --git a/kdeui/colors/rgb.txt b/kdeui/colors/rgb.txt index 44abf9730..62eb8961e 100644 --- a/kdeui/colors/rgb.txt +++ b/kdeui/colors/rgb.txt @@ -21,7 +21,7 @@ 255 218 185 PeachPuff 255 222 173 navajo white 255 222 173 NavajoWhite -255 228 181 tqmoccasin +255 228 181 moccasin 255 248 220 cornsilk 255 255 240 ivory 255 250 205 lemon chiffon diff --git a/kdeui/kaboutapplication.h b/kdeui/kaboutapplication.h index fc545bc7f..d8356ce66 100644 --- a/kdeui/kaboutapplication.h +++ b/kdeui/kaboutapplication.h @@ -79,7 +79,7 @@ class KDEUI_EXPORT KAboutApplication : public KAboutDialog KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true ); /* - FIXME: The two constructors should be tqreplaced with the following after the lib freeze: + FIXME: The two constructors should be replaced with the following after the lib freeze: KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true ); diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index 2ef4caa24..12e610791 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -41,15 +41,15 @@ #include #include -//TQMOC_SKIP_BEGIN +//MOC_SKIP_BEGIN template class TQPtrList; -//TQMOC_SKIP_END +//MOC_SKIP_END #define WORKTEXT_IDENTATION 16 #define Grid 3 // ############################################################## -// TQMOC OUTPUT FILES: +// MOC OUTPUT FILES: #include "kaboutdialog.moc" #include "kaboutdialog_private.moc" // ############################################################## @@ -58,8 +58,8 @@ class KAboutTabWidget : public QTabWidget { public: KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize tqsizeHint() const { - return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); + TQSize sizeHint() const { + return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); } }; @@ -106,7 +106,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname, connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(urlClickedSlot(const TQString &))); - mLabel[3]->tqsetAlignment( AlignTop ); + mLabel[3]->setAlignment( AlignTop ); fontChange( font() ); updateLayout(); @@ -180,7 +180,7 @@ TQString KAboutContributor::getWork( void ) const void KAboutContributor::updateLayout( void ) { - delete tqlayout(); + delete layout(); int row = 0; if( !mText[0]->text().isEmpty() ) { ++row; } @@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void ) } gbox->activate(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } @@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ ) } -TQSize KAboutContributor::tqsizeHint( void ) const +TQSize KAboutContributor::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -293,7 +293,7 @@ void KAboutContributor::emailClickedSlot( const TQString &e ) // // Internal widget for the KAboutDialog class. // -KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent, +KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent, char *_name ) : TQWidget( _parent, _name ), mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0), @@ -302,24 +302,24 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent, mTopLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); if( !mTopLayout ) { return; } - if( tqlayoutType & AbtImageOnly ) + if( layoutType & AbtImageOnly ) { - tqlayoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain); + layoutType &= ~(AbtImageLeft|AbtImageRight|AbtTabbed|AbtPlain); } - if( tqlayoutType & AbtImageLeft ) + if( layoutType & AbtImageLeft ) { - tqlayoutType &= ~AbtImageRight; + layoutType &= ~AbtImageRight; } - if( tqlayoutType & AbtTitle ) + if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->tqsetAlignment(AlignCenter); + mTitleLabel->setAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } - if( tqlayoutType & AbtProduct ) + if( layoutType & AbtProduct ) { TQWidget* const productArea = new TQWidget( this, "area" ); mTopLayout->addWidget( productArea, 0, TQApplication::reverseLayout() ? AlignRight : AlignLeft ); @@ -347,7 +347,7 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent, if( !hbox ) { return; } mTopLayout->addLayout( hbox, 10 ); - if( tqlayoutType & AbtImageLeft ) + if( layoutType & AbtImageLeft ) { TQVBoxLayout* vbox = new TQVBoxLayout(); hbox->addLayout(vbox); @@ -367,13 +367,13 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent, vbox->activate(); } - if( tqlayoutType & AbtTabbed ) + if( layoutType & AbtTabbed ) { mPageTab = new KAboutTabWidget( this ); if( !mPageTab ) { return; } hbox->addWidget( mPageTab, 10 ); } - else if( tqlayoutType & AbtImageOnly ) + else if( layoutType & AbtImageOnly ) { mImageFrame = new TQFrame( this ); setImageFrame( true ); @@ -398,7 +398,7 @@ KAboutContainerBase::KAboutContainerBase( int tqlayoutType, TQWidget *_parent, hbox->addWidget( mPlainSpace, 10 ); } - if( tqlayoutType & AbtImageRight ) + if( layoutType & AbtImageRight ) { TQVBoxLayout *vbox = new TQVBoxLayout(); hbox->addLayout(vbox); @@ -427,9 +427,9 @@ void KAboutContainerBase::show( void ) TQWidget::show(); } -TQSize KAboutContainerBase::tqsizeHint( void ) const +TQSize KAboutContainerBase::sizeHint( void ) const { - return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); + return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); } void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) @@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->tqparentWidget()->tqlayout()->activate(); + mVersionLabel->parentWidget()->layout()->activate(); } update(); @@ -518,7 +518,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title, { if( !mPageTab ) { - kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "addPage: " << "Invalid layout" << endl; return 0; } @@ -543,7 +543,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage( { if( !mPageTab ) { - kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "addPage: " << "Invalid layout" << endl; return 0; } @@ -572,7 +572,7 @@ TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title ) { if( !mPageTab ) { - kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "addPage: " << "Invalid layout" << endl; return 0; } @@ -605,7 +605,7 @@ void KAboutContainerBase::setTitle( const TQString &title ) { if( !mTitleLabel ) { - kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setTitle: " << "Invalid layout" << endl; return; } mTitleLabel->setText(title); @@ -616,7 +616,7 @@ void KAboutContainerBase::setImage( const TQString &fileName ) { if( !mImageLabel ) { - kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setImage: " << "Invalid layout" << endl; return; } if( fileName.isNull() ) @@ -628,7 +628,7 @@ void KAboutContainerBase::setImage( const TQString &fileName ) if( !logo.isNull() ) mImageLabel->setPixmap( logo ); - mImageFrame->tqlayout()->activate(); + mImageFrame->layout()->activate(); } void KAboutContainerBase::setProgramLogo( const TQString &fileName ) @@ -646,7 +646,7 @@ void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap ) { if( !mIconLabel ) { - kdDebug(291) << "setProgramLogo: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setProgramLogo: " << "Invalid layout" << endl; return; } if( !pixmap.isNull() ) @@ -689,7 +689,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, { if( !mIconLabel ) { - kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl; + kdDebug(291) << "setProduct: " << "Invalid layout" << endl; return; } @@ -702,9 +702,9 @@ void KAboutContainerBase::setProduct( const TQString &appName, kdDebug(291) << "no kapp" << endl; const TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName).arg(version). - arg(TQString::tqfromLatin1(KDE_VERSION_STRING)); + arg(TQString::fromLatin1(KDE_VERSION_STRING)); const TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year). - arg(author) : TQString::tqfromLatin1(""); + arg(author) : TQString::fromLatin1(""); //if (!year.isEmpty()) // msg2 = i18n("%1 %2, %3").arg('©').arg(year).arg(author); @@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->tqparentWidget()->tqlayout()->activate(); + mIconLabel->parentWidget()->layout()->activate(); } @@ -790,7 +790,7 @@ void KAboutContainer::childEvent( TQChildEvent *e ) TQWidget* const w = static_cast(e->child()); mVbox->addWidget( w, 0, mAlignment ); - const TQSize s( tqsizeHint() ); + const TQSize s( sizeHint() ); setMinimumSize( s ); TQObjectList* const l = const_cast(children()); // silence please @@ -806,12 +806,12 @@ void KAboutContainer::childEvent( TQChildEvent *e ) } -TQSize KAboutContainer::tqsizeHint( void ) const +TQSize KAboutContainer::sizeHint( void ) const { // - // The size is computed by adding the tqsizeHint().height() of all + // The size is computed by adding the sizeHint().height() of all // widget children and taking the width of the widest child and adding - // tqlayout()->margin() and tqlayout()->spacing() + // layout()->margin() and layout()->spacing() // TQSize total_size; @@ -828,13 +828,13 @@ TQSize KAboutContainer::tqsizeHint( void ) const ++numChild; TQWidget* const w= static_cast(o); - TQSize s = w->tqminimumSize(); + TQSize s = w->minimumSize(); if( s.isEmpty() ) { - s = w->tqminimumSizeHint(); + s = w->minimumSizeHint(); if( s.isEmpty() ) { - s = w->tqsizeHint(); + s = w->sizeHint(); if( s.isEmpty() ) { s = TQSize( 100, 100 ); // Default size @@ -850,11 +850,11 @@ TQSize KAboutContainer::tqsizeHint( void ) const { // // Seems I have to add 1 to the height to properly show the border - // of the last entry if tqlayout()->margin() is 0 + // of the last entry if layout()->margin() is 0 // - total_size.setHeight( total_size.height() + tqlayout()->spacing()*(numChild-1) ); - total_size += TQSize( tqlayout()->margin()*2, tqlayout()->margin()*2 + 1 ); + total_size.setHeight( total_size.height() + layout()->spacing()*(numChild-1) ); + total_size += TQSize( layout()->margin()*2, layout()->margin()*2 + 1 ); } else { @@ -864,9 +864,9 @@ TQSize KAboutContainer::tqsizeHint( void ) const } -TQSize KAboutContainer::tqminimumSizeHint( void ) const +TQSize KAboutContainer::minimumSizeHint( void ) const { - return tqsizeHint(); + return sizeHint(); } @@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email, } -void KAboutContainer::addTitle( const TQString &title, int tqalignment, +void KAboutContainer::addTitle( const TQString &title, int alignment, bool showFrame, bool showBold ) { @@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment, { label->setFrameStyle(TQFrame::Panel | TQFrame::Raised); } - label->tqsetAlignment( tqalignment ); + label->setAlignment( alignment ); } -void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) +void KAboutContainer::addImage( const TQString &fileName, int alignment ) { if( fileName.isNull() ) { @@ -924,11 +924,11 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) pix = logo; label->setPixmap( pix ); } - label->tqsetAlignment( tqalignment ); + label->setAlignment( alignment ); } #if 0 -//TQMOC_SKIP_BEGIN +//MOC_SKIP_BEGIN /** Every person displayed is stored in a KAboutContributor object. * Every contributor, the author and/or the maintainer of the application are @@ -959,9 +959,9 @@ public: * possible, but very long texts might look ugly. */ void setWork(const TQString&); /** The size hint. Very important here, since KAboutWidget relies on it for - * tqgeometry management. */ - TQSize tqsizeHint(); - TQSize tqminimumSizeHint(void); + * geometry management. */ + TQSize sizeHint(); + TQSize minimumSizeHint(void); virtual void show( void ); // ---------------------------------------------------------------------------- @@ -1007,7 +1007,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n) if(name==0 || email==0) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl; - tqApp->quit(); + qApp->quit(); } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- @@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w) #if 0 QSize -KAboutContributor::tqsizeHint() +KAboutContributor::sizeHint() { // ############################################################################ const int FrameWidth=frameWidth(); @@ -1104,8 +1104,8 @@ KAboutContributor::tqsizeHint() int maxx, maxy; TQRect rect; // ----- first calculate name and email width: - maxx=name->tqsizeHint().width(); - maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION); + maxx=name->sizeHint().width(); + maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION); // ----- now determine "work" text rectangle: if(!work.isEmpty()) // save time { @@ -1116,10 +1116,10 @@ KAboutContributor::tqsizeHint() { maxx=WorkTextWidth+WORKTEXT_IDENTATION; } - maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION); + maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION); // ----- - maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels - maxy+=/* email */ name->tqsizeHint().height(); + maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels + maxy+=/* email */ name->sizeHint().height(); maxy+=rect.height(); // ----- maxx+=2*FrameWidth; @@ -1128,16 +1128,16 @@ KAboutContributor::tqsizeHint() // ############################################################################ } -TQSize KAboutContributor::tqminimumSizeHint(void) +TQSize KAboutContributor::minimumSizeHint(void) { - return( tqsizeHint() ); + return( sizeHint() ); } void KAboutContributor::show( void ) { TQFrame::show(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } @@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*) int cy=framewidth; // ----- name->setGeometry - (framewidth, framewidth, childwidth, name->tqsizeHint().height()); + (framewidth, framewidth, childwidth, name->sizeHint().height()); cy=name->height()+Grid; email->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height()); cy+=name->height()+Grid; url->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height()); // the work text is drawn in the paint event // ############################################################################ } @@ -1181,20 +1181,20 @@ KAboutContributor::paintEvent(TQPaintEvent* e) paint.drawText(WORKTEXT_IDENTATION, cy, w, h, AlignLeft | WordBreak, work); // ############################################################################ } -// TQMOC_SKIP_END +// MOC_SKIP_END #endif #if 0 -TQSize KAboutContributor::tqsizeHint( void ) +TQSize KAboutContributor::sizeHint( void ) { int s = KDialog::spacingHint(); int h = fontMetrics().lineSpacing()*3 + 2*s; int m = frameWidth(); - int w = name->tqsizeHint().width(); - w = QMAX( w, email->tqsizeHint().width()+s); - w = QMAX( w, url->tqsizeHint().width()+s); + int w = name->sizeHint().width(); + w = QMAX( w, email->sizeHint().width()+s); + w = QMAX( w, url->sizeHint().width()+s); if( work.isEmpty() == false ) { @@ -1214,10 +1214,10 @@ TQSize KAboutContributor::tqsizeHint( void ) int s = 3; int m = frameWidth() + KDialog::spacingHint(); int h = ls * 3 + s * 2; - int w = name->tqsizeHint().width(); + int w = name->sizeHint().width(); - w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION); - w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION); if( work.isEmpty() == false ) { const int WorkTextWidth=200; @@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*) int x = frameWidth() + KDialog::spacingHint(); int y = x; int w = width() - 2*x; - int h = name->tqsizeHint().height(); + int h = name->sizeHint().height(); int s = 3; name->setGeometry( x, y, w, h ); @@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e ) int s = 3; int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION; int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint()); - int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3; + int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3; int h = height()-y-frameWidth(); TQPainter paint( this ); @@ -1320,13 +1320,13 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl; - tqApp->quit(); + qApp->quit(); } // ----- cont->setText(i18n("Other Contributors:")); logo->setText(i18n("(No logo available)")); logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - version->tqsetAlignment(AlignCenter); + version->setAlignment(AlignCenter); // ----- connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); @@ -1350,33 +1350,33 @@ KAboutWidget::adjust() // ----- if(showMaintainer) { - total_size=maintainer->tqsizeHint(); + total_size=maintainer->sizeHint(); maintWidth=total_size.width(); maintHeight=total_size.height(); } else { maintWidth=0; maintHeight=0; } - total_size=author->tqsizeHint(); + total_size=author->sizeHint(); logo->adjustSize(); - cy=version->tqsizeHint().height()+Grid; + cy=version->sizeHint().height()+Grid; cx=logo->width(); tempx=QMAX(total_size.width(), maintWidth); cx+=Grid+tempx; - cx=QMAX(cx, version->tqsizeHint().width()); + cx=QMAX(cx, version->sizeHint().width()); cy+=QMAX(logo->height(), total_size.height()+(showMaintainer ? Grid+maintHeight : 0)); // ----- if(!contributors.isEmpty()) { - cx=QMAX(cx, cont->tqsizeHint().width()); - cy+=cont->tqsizeHint().height()+Grid; + cx=QMAX(cx, cont->sizeHint().width()); + cy+=cont->sizeHint().height()+Grid; TQPtrListIterator _pos(contributors); KAboutContributor* currEntry; while ( (currEntry = _pos.current()) ) { ++_pos; - cy+=currEntry->tqsizeHint().height(); + cy+=currEntry->sizeHint().height(); } } // ----- @@ -1458,8 +1458,8 @@ KAboutWidget::resizeEvent(TQResizeEvent*) { // ############################################################################ int _x=0, _y, cx, tempx, tempy; - // ----- set version label tqgeometry: - version->setGeometry(0, 0, width(), version->tqsizeHint().height()); + // ----- set version label geometry: + version->setGeometry(0, 0, width(), version->sizeHint().height()); _y=version->height()+Grid; // ----- move logo to correct position: logo->adjustSize(); @@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*) tempx=logo->width()+Grid; cx=width()-tempx; author->setGeometry - (tempx, _y, cx, author->tqsizeHint().height()); + (tempx, _y, cx, author->sizeHint().height()); maintainer->setGeometry - (tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height()); + (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height()); _y+=QMAX(logo->height(), author->height()+(showMaintainer ? Grid+maintainer->height() : 0)); // ----- if(!contributors.isEmpty()) { - tempy=cont->tqsizeHint().height(); + tempy=cont->sizeHint().height(); cont->setGeometry(0, _y, width(), tempy); cont->show(); _y+=tempy+Grid; @@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) while( (currEntry = _pos.current()) ) { ++_pos; - tempy=currEntry->tqsizeHint().height(); + tempy=currEntry->sizeHint().height(); // y+=Grid; currEntry->setGeometry(_x, _y, width(), tempy); _y+=tempy; @@ -1512,7 +1512,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl; - tqApp->quit(); + qApp->quit(); } setMainWidget(about); connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), @@ -1523,7 +1523,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal) } -KAboutDialog::KAboutDialog( int tqlayoutType, const TQString &_caption, +KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption, int buttonMask, ButtonCode defaultButton, TQWidget *_parent, const char *_name, bool modal, bool separator, const TQString &user1, @@ -1534,7 +1534,7 @@ KAboutDialog::KAboutDialog( int tqlayoutType, const TQString &_caption, { setPlainCaption( i18n("About %1").arg(_caption) ); - mContainerBase = new KAboutContainerBase( tqlayoutType, this ); + mContainerBase = new KAboutContainerBase( layoutType, this ); setMainWidget(mContainerBase); connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)), @@ -1567,7 +1567,7 @@ void KAboutDialog::adjust() if( !about ) { return; } about->adjust(); //initializeGeometry(); - resize( tqsizeHint() ); + resize( sizeHint() ); } diff --git a/kdeui/kaboutdialog.h b/kdeui/kaboutdialog.h index ccad3c0dc..8d732cdbe 100644 --- a/kdeui/kaboutdialog.h +++ b/kdeui/kaboutdialog.h @@ -22,7 +22,7 @@ /* * This file declares a class for creating "About ..." dialogs - * in a general way. It provides tqgeometry management and some + * in a general way. It provides geometry management and some * options to connect for, like emailing the author or maintainer. */ @@ -62,12 +62,12 @@ class KDEUI_EXPORT KAboutContainer : public QFrame const TQString &url, const TQString &task, bool showHeader = false, bool showframe = false, bool showBold = false ); - void addTitle( const TQString &title, int tqalignment=AlignLeft, + void addTitle( const TQString &title, int alignment=AlignLeft, bool showframe = false, bool showBold = false ); - void addImage( const TQString &fileName, int tqalignment=AlignLeft ); + void addImage( const TQString &fileName, int alignment=AlignLeft ); - virtual TQSize tqsizeHint( void ) const; - virtual TQSize tqminimumSizeHint( void ) const; + virtual TQSize sizeHint( void ) const; + virtual TQSize minimumSizeHint( void ) const; protected: virtual void childEvent( TQChildEvent *e ); @@ -115,7 +115,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame TQString getURL( void ) const; TQString getWork( void ) const; - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; protected: virtual void fontChange( const TQFont &oldFont ); @@ -265,12 +265,12 @@ class KAboutDialogPrivate; * can be used to build the contents of the dialog. The first (Constructor I) * provides a number of easy to use methods. Basically it allows you * to add the components of choice, and the components are placed in a - * predefined tqlayout. You do not have to plan the tqlayout. Everything is + * predefined layout. You do not have to plan the layout. Everything is * taken care of. * * The second constructor (Constructor II) works in quite the same manner * as the first, but you have better control on where the components - * are postioned in the tqlayout and you have access to an extended number + * are postioned in the layout and you have access to an extended number * of components you can install such as titles, product information, * a tabbed pages (where you can display rich text with url links) and * a person (developer) information field. The "About KDE" dialog box is @@ -321,7 +321,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase * setImageFrame(), setProduct(), addTextPage(), * addContainerPage(), addContainer(), or addPage(). * - * @param dialogLayout Use a tqmask of LayoutType flags. + * @param dialogLayout Use a mask of LayoutType flags. * @param caption The dialog caption. The text you specify is prepended * by i18n("About"). * @param buttonMask Specifies what buttons will be visible. @@ -467,7 +467,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase * @param richText Set this to @p true if 'text' is rich text. * @param numLines The text area height will be adjusted so that this * is the minimum number of lines of text that are visible. - * @return The frame that tqcontains the page. + * @return The frame that contains the page. */ TQFrame *addTextPage( const TQString &title, const TQString &text, bool richText=false, int numLines=10 ); @@ -480,7 +480,7 @@ class KDEUI_EXPORT KAboutDialog : public KDialogBase * @param text The text to display. * @param numLines The text area height will be adjusted so that this * is the minimum number of lines of text that are visible. - * @return The frame that tqcontains the page. + * @return The frame that contains the page. */ TQFrame *addLicensePage( const TQString &title, const TQString &text, int numLines=10 ); diff --git a/kdeui/kaboutdialog_private.h b/kdeui/kaboutdialog_private.h index 48441fc0c..563eb825b 100644 --- a/kdeui/kaboutdialog_private.h +++ b/kdeui/kaboutdialog_private.h @@ -86,9 +86,9 @@ class KAboutContainerBase : public QWidget }; public: - KAboutContainerBase( int tqlayoutType, TQWidget *parent = 0, char *name = 0 ); + KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); virtual void show( void ); - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; void setTitle( const TQString &title ); void setImage( const TQString &fileName ); diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp index 7ab50dca6..1d05e289c 100644 --- a/kdeui/kaboutkde.cpp +++ b/kdeui/kaboutkde.cpp @@ -27,7 +27,7 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) - :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("KDE"), + :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("KDE"), KDialogBase::Help|KDialogBase::Close, KDialogBase::Close, parent, name, modal ) { @@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) "donation, using one of the ways described at " "http://trinity.pearsoncomputing.net/support/." "

Thank you very much in advance for your support!"); - setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null ); + setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null ); setTitle(i18n("Trinity Desktop Environment. Release %1"). - arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) ); + arg(TQString::fromLatin1(KDE_VERSION_STRING)) ); addTextPage( i18n("About Trinity","&About"), text1, true ); addTextPage( i18n("&Report Bugs or Wishes"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); - setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) ); + setImage( locate( "data", TQString::fromLatin1("kdeui/pics/aboutkde.png")) ); setImageBackgroundColor( white ); } diff --git a/kdeui/kaccelgen.h b/kdeui/kaccelgen.h index e3b28f10f..8f0c50bed 100644 --- a/kdeui/kaccelgen.h +++ b/kdeui/kaccelgen.h @@ -47,7 +47,7 @@ * importance (it may seem like these are implementation details, but * IMHO the policy is an important part of the interface): * - * 1. If the string already tqcontains an '&' character, skip this + * 1. If the string already contains an '&' character, skip this * string, because we consider such strings to be "user-specified" * accelerators. * @@ -131,9 +131,9 @@ loadPredefined(Iter begin, Iter end, TQMap& keys) { for (Iter i = begin; i != end; ++i) { TQString item = Deref::deref(i); - int user_ampersand = item.tqfind(TQChar('&')); + int user_ampersand = item.find(TQChar('&')); if( user_ampersand >= 0 ) { - // Sanity check. Note that we don't try to tqfind an + // Sanity check. Note that we don't try to find an // accelerator if the user shoots him/herself in the foot // by adding a bad '&'. if( isLegalAccelerator(item, user_ampersand+1) ) { @@ -176,9 +176,9 @@ generate(Iter begin, Iter end, TQStringList& target) for (Iter i = begin; i != end; ++i) { TQString item = Iter_Deref::deref(i); - // Attempt to tqfind a good accelerator, but only if the user + // Attempt to find a good accelerator, but only if the user // has not manually hardcoded one. - int user_ampersand = item.tqfind(TQChar('&')); + int user_ampersand = item.find(TQChar('&')); if( user_ampersand < 0 || item[user_ampersand+1] == '&') { bool found = false; uint found_idx; @@ -187,7 +187,7 @@ generate(Iter begin, Iter end, TQStringList& target) // Check word-starting letters first. for( j=0; j < item.length(); ++j ) { if( isLegalAccelerator(item, j) - && !used_accels.tqcontains(item[j]) + && !used_accels.contains(item[j]) && (0 == j || (j > 0 && item[j-1].isSpace())) ) { found = true; found_idx = j; @@ -199,7 +199,7 @@ generate(Iter begin, Iter end, TQStringList& target) // No word-starting letter; search for any letter. for( j=0; j < item.length(); ++j ) { if( isLegalAccelerator(item, j) - && !used_accels.tqcontains(item[j]) ) { + && !used_accels.contains(item[j]) ) { found = true; found_idx = j; break; diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 5689427d5..9bfd23468 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -277,18 +277,18 @@ bool KAction::isPlugged() const bool KAction::isPlugged( const TQWidget *container ) const { - return tqfindContainer( container ) > -1; + return findContainer( container ) > -1; } bool KAction::isPlugged( const TQWidget *container, int id ) const { - int i = tqfindContainer( container ); + int i = findContainer( container ); return ( i > -1 && itemId( i ) == id ); } bool KAction::isPlugged( const TQWidget *container, const TQWidget *_representative ) const { - int i = tqfindContainer( container ); + int i = findContainer( container ); return ( i > -1 && representative( i ) == _representative ); } @@ -309,7 +309,7 @@ We have two KoView objects which both point to the same KoDoc object Undo and Redo should be available in both KoView objects, and calling the undo->setEnabled() should affect both KoViews -When addClient is called, it needs to be able to tqfind the undo and redo actions +When addClient is called, it needs to be able to find the undo and redo actions When it calls plug() on them, they need to be inserted into the KAccel object of the appropriate KoView In this case, the actionCollection belongs to KoDoc and we need to let it know that its shortcuts @@ -482,7 +482,7 @@ void KAction::insertKAccel( KAccel* kaccel ) } } else - kdWarning(129) << "KAction::insertKAccel( kaccel = " << kaccel << " ): KAccel object already tqcontains an action name \"" << name() << "\"" << endl; // -- ellis + kdWarning(129) << "KAction::insertKAccel( kaccel = " << kaccel << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis } void KAction::removeKAccel( KAccel* kaccel ) @@ -530,9 +530,9 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id ) // show the string representation of its shortcut. if ( d->m_kaccel || d->m_kaccelList.count() ) { TQString s = menu->text( id ); - int i = s.tqfind( '\t' ); + int i = s.find( '\t' ); if ( i >= 0 ) - s.tqreplace( i+1, s.length()-i, d->m_cut.seq(0).toString() ); + s.replace( i+1, s.length()-i, d->m_cut.seq(0).toString() ); else s += "\t" + d->m_cut.seq(0).toString(); @@ -744,7 +744,7 @@ int KAction::plug( TQWidget *w, int index ) void KAction::unplug( TQWidget *w ) { - int i = tqfindContainer( w ); + int i = findContainer( w ); if ( i == -1 ) return; int id = itemId( i ); @@ -795,7 +795,7 @@ void KAction::plugAccel(KAccel *kacc, bool configurable) //connect(d->m_kaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged())); } else - kdWarning(129) << "KAction::plugAccel( kacc = " << kacc << " ): KAccel object already tqcontains an action name \"" << name() << "\"" << endl; // -- ellis + kdWarning(129) << "KAction::plugAccel( kacc = " << kacc << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis } void KAction::unplugAccel() @@ -810,10 +810,10 @@ void KAction::unplugAccel() void KAction::plugMainWindowAccel( TQWidget *w ) { - // Note: tqtopLevelWidget() stops too early, we can't use it. + // Note: topLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast(tl); // try to see if it's a kmainwindow @@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!d->iconName().isEmpty()) - return TQString::tqfromLatin1(" %2").arg(d->iconName() ).arg(text); + return TQString::fromLatin1(" %2").arg(d->iconName() ).arg(text); return text; } @@ -1121,7 +1121,7 @@ void KAction::slotPopupActivated() if( ::qt_cast(sender())) { int id = dynamic_cast(sender())->value().toInt(); - int pos = tqfindContainer(id); + int pos = findContainer(id); if(pos != -1) { TQPopupMenu* qpm = dynamic_cast( container(pos) ); @@ -1187,13 +1187,13 @@ void KAction::slotDestroyed() int i; do { - i = tqfindContainer( static_cast( o ) ); + i = findContainer( static_cast( o ) ); if ( i != -1 ) removeContainer( i ); } while ( i != -1 ); } -int KAction::tqfindContainer( const TQWidget* widget ) const +int KAction::findContainer( const TQWidget* widget ) const { int pos = 0; @@ -1213,7 +1213,7 @@ int KAction::tqfindContainer( const TQWidget* widget ) const return -1; } -int KAction::tqfindContainer( const int id ) const +int KAction::findContainer( const int id ) const { int pos = 0; diff --git a/kdeui/kaction.h b/kdeui/kaction.h index 7f0da031f..85be6e3dc 100644 --- a/kdeui/kaction.h +++ b/kdeui/kaction.h @@ -199,7 +199,7 @@ class KMainWindow; * * @see KStdAction */ -class KDEUI_EXPORT KAction : public TQObject +class KDEUI_EXPORT KAction : public QObject { friend class KActionCollection; Q_OBJECT @@ -576,8 +576,8 @@ protected: KToolBar* toolBar( int index ) const; TQPopupMenu* popupMenu( int index ) const; void removeContainer( int index ); - int tqfindContainer( const TQWidget* widget ) const; - int tqfindContainer( int id ) const; + int findContainer( const TQWidget* widget ) const; + int findContainer( int id ) const; void plugMainWindowAccel( TQWidget *w ); void addContainer( TQWidget* parent, int id ); diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 3974496c6..f5a031869 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -627,8 +627,8 @@ void KSelectAction::updateItems( int id ) TQStringList::ConstIterator it = lst.begin(); for( ; it != lst.end(); ++it ) cb->insertItem( *it ); - // qt caches and never recalculates the tqsizeHint() - // qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint + // qt caches and never recalculates the sizeHint() + // qcombobox.cpp recommends calling setFont to invalidate the sizeHint // setFont sets own_font = True, so we're a bit mean and calll // unsetFont which calls setFont and then overwrites the own_font cb->unsetFont(); @@ -678,7 +678,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) if ( cb ) { if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); if ( d->m_comboWidth > 0 ) { cb->setMinimumWidth( d->m_comboWidth ); @@ -730,7 +730,7 @@ TQStringList KSelectAction::comboItems() const for( ; it != d->m_list.end(); ++it ) { TQString item = *it; - int i = item.tqfind( '&' ); + int i = item.find( '&' ); if ( i > -1 ) item = item.remove( i, 1 ); lst.append( item ); @@ -779,18 +779,18 @@ void KSelectAction::slotActivated( const TQString &text ) if ( isEditable() ) { TQStringList lst = d->m_list; - if(!lst.tqcontains(text)) + if(!lst.contains(text)) { lst.append( text ); setItems( lst ); } } - int i = d->m_list.tqfindIndex( text ); + int i = d->m_list.findIndex( text ); if ( i > -1 ) setCurrentItem( i ); else - setCurrentItem( comboItems().tqfindIndex( text ) ); + setCurrentItem( comboItems().findIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); @@ -1476,7 +1476,7 @@ void KFontAction::setFont( const TQString &family ) return; } } - i = lowerName.tqfind(" ["); + i = lowerName.find(" ["); if (i>-1) { lowerName = lowerName.left(i); @@ -1513,7 +1513,7 @@ void KFontAction::setFont( const TQString &family ) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); + realFamily.remove(realFamily.find(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setFont( realFamily ); @@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); @@ -1637,7 +1637,7 @@ void KFontSizeAction::init() void KFontSizeAction::setFontSize( int size ) { if ( size == fontSize() ) { - setCurrentItem( items().tqfindIndex( TQString::number( size ) ) ); + setCurrentItem( items().findIndex( TQString::number( size ) ) ); return; } @@ -1646,7 +1646,7 @@ void KFontSizeAction::setFontSize( int size ) return; } - int index = items().tqfindIndex( TQString::number( size ) ); + int index = items().findIndex( TQString::number( size ) ); if ( index == -1 ) { // Insert at the correct position in the list (to keep sorting) TQValueList lst; @@ -1664,7 +1664,7 @@ void KFontSizeAction::setFontSize( int size ) strLst.append( TQString::number(*it) ); KSelectAction::setItems( strLst ); // Find new current item - index = lst.tqfindIndex( size ); + index = lst.findIndex( size ); setCurrentItem( index ); } else @@ -2021,10 +2021,10 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) return -1; if ( !m_toolBar ) { - // Note: tqtopLevelWidget() stops too early, we can't use it. + // Note: topLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast(tl); // try to see if it's a kmainwindow @@ -2139,7 +2139,7 @@ void KWidgetAction::setAutoSized( bool autoSized ) return; KToolBar* toolBar = (KToolBar*)m_widget->parent(); - int i = tqfindContainer( toolBar ); + int i = findContainer( toolBar ); if ( i == -1 ) return; int id = itemId( i ); @@ -2326,14 +2326,14 @@ void KPasteTextAction::menuAboutToShow() if (reply.isValid()) list = reply; } - TQString clipboardText = tqApp->clipboard()->text(QClipboard::Clipboard); + TQString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard); if (list.isEmpty()) list << clipboardText; bool found = false; for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { TQString text = KStringHandler::cEmSqueeze((*it).simplifyWhiteSpace(), m_popup->fontMetrics(), 20); - text.tqreplace("&", "&&"); + text.replace("&", "&&"); int id = m_popup->insertItem(text); if (!found && *it == clipboardText) { @@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id) TQString clipboardText = reply; reply = klipper.call("setClipboardContents(TQString)", clipboardText); if (reply.isValid()) - kdDebug(129) << "Clipboard: " << tqApp->clipboard()->text(QClipboard::Clipboard) << endl; + kdDebug(129) << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard) << endl; } TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); } @@ -2362,7 +2362,7 @@ void KPasteTextAction::menuItemActivated( int id) void KPasteTextAction::slotActivated() { if (!m_mixedMode) { - TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true); + TQWidget *w = qApp->widgetAt(TQCursor::pos(), true); TQMimeSource *data = TQApplication::clipboard()->data(); if (!data->provides("text/plain") && w) { m_popup->popup(w->mapToGlobal(TQPoint(0, w->height()))); diff --git a/kdeui/kactionclasses.h b/kdeui/kactionclasses.h index 0c2cf5bef..9a0ffbbae 100644 --- a/kdeui/kactionclasses.h +++ b/kdeui/kactionclasses.h @@ -186,7 +186,7 @@ public: /** * Defines the text (and icon, tooltip, whatsthis) that should be displayed * instead of the normal text, when the action is checked. - * This feature tqreplaces the checkmark that usually appears in front of the text, in menus. + * This feature replaces the checkmark that usually appears in front of the text, in menus. * It is useful when the text is mainly a verb: e.g. "Show " * should turn into "Hide " when activated. * @@ -1393,7 +1393,7 @@ public: /** * Controls the behavior of the clipboard history menu popup. * - * @param mode If false and the clipboard tqcontains a non-text object + * @param mode If false and the clipboard contains a non-text object * the popup menu with the clipboard history will appear * immediately as the user clicks the toolbar action; if * true, the action works like the standard paste action diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp index b22f4fe13..e383809c6 100644 --- a/kdeui/kactioncollection.cpp +++ b/kdeui/kactioncollection.cpp @@ -426,7 +426,7 @@ TQStringList KActionCollection::groups() const TQAsciiDictIterator it( d->m_actionDict ); for( ; it.current(); ++it ) - if ( !it.current()->group().isEmpty() && !lst.tqcontains( it.current()->group() ) ) + if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) ) lst.append( it.current()->group() ); return lst; @@ -549,12 +549,12 @@ void KActionCollection::slotMenuItemHighlighted( int id ) TQWidget *container = static_cast( const_cast( sender() ) ); - d->m_currentHighlightAction = tqfindAction( container, id ); + d->m_currentHighlightAction = findAction( container, id ); if ( !d->m_currentHighlightAction ) { if ( !d->m_statusCleared ) - emit cleartqStatusText(); + emit clearStatusText(); d->m_statusCleared = true; return; } @@ -562,7 +562,7 @@ void KActionCollection::slotMenuItemHighlighted( int id ) d->m_statusCleared = false; emit actionHighlighted( d->m_currentHighlightAction ); emit actionHighlighted( d->m_currentHighlightAction, true ); - emit actiontqStatusText( d->m_currentHighlightAction->toolTip() ); + emit actionStatusText( d->m_currentHighlightAction->toolTip() ); } void KActionCollection::slotMenuAboutToHide() @@ -572,7 +572,7 @@ void KActionCollection::slotMenuAboutToHide() d->m_currentHighlightAction = 0; if ( !d->m_statusCleared ) - emit cleartqStatusText(); + emit clearStatusText(); d->m_statusCleared = true; } @@ -583,13 +583,13 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) TQWidget *container = static_cast( const_cast( sender() ) ); - KAction *action = tqfindAction( container, id ); + KAction *action = findAction( container, id ); if ( !action ) { d->m_currentHighlightAction = 0; // use tooltip groups for toolbar status text stuff instead (Simon) -// emit cleartqStatusText(); +// emit clearStatusText(); return; } @@ -600,7 +600,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) else { d->m_currentHighlightAction = 0; -// emit cleartqStatusText(); +// emit clearStatusText(); } } @@ -609,7 +609,7 @@ void KActionCollection::slotDestroyed() d->m_dctHighlightContainers.remove( reinterpret_cast( const_cast(sender()) ) ); } -KAction *KActionCollection::tqfindAction( TQWidget *container, int id ) +KAction *KActionCollection::findAction( TQWidget *container, int id ) { TQPtrList *actionList = d->m_dctHighlightContainers[ reinterpret_cast( container ) ]; @@ -713,8 +713,8 @@ bool KActionShortcutList::save() const if( m_actions.xmlFile().isEmpty() ) return writeSettings(); - TQString attrShortcut = TQString::tqfromLatin1("shortcut"); - TQString attrAccel = TQString::tqfromLatin1("accel"); // Depricated attribute + TQString attrShortcut = TQString::fromLatin1("shortcut"); + TQString attrAccel = TQString::fromLatin1("accel"); // Depricated attribute // Read XML file TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) ); @@ -736,7 +736,7 @@ bool KActionShortcutList::save() const // now see if this element already exists // and create it if necessary (unless bSameAsDefault) - TQDomElement act_elem = KXMLGUIFactory::tqfindActionByName( elem, sName, !bSameAsDefault ); + TQDomElement act_elem = KXMLGUIFactory::findActionByName( elem, sName, !bSameAsDefault ); if ( act_elem.isNull() ) continue; diff --git a/kdeui/kactioncollection.h b/kdeui/kactioncollection.h index 836a58c14..7ce10052c 100644 --- a/kdeui/kactioncollection.h +++ b/kdeui/kactioncollection.h @@ -69,13 +69,13 @@ typedef TQValueList KActionPtrList; * * \code * actionCollection()->setHighlightingEnabled(true); - * connect(actionCollection(), TQT_SIGNAL( actiontqStatusText( const TQString & ) ), + * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), * statusBar(), TQT_SLOT( message( const TQString & ) ) ); - * connect(actionCollection(), TQT_SIGNAL( cleartqStatusText() ), + * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ), * statusBar(), TQT_SLOT( clear() ) ); * \endcode */ -class KDEUI_EXPORT KActionCollection : public TQObject +class KDEUI_EXPORT KActionCollection : public QObject { friend class KAction; friend class KXMLGUIClient; @@ -298,13 +298,13 @@ signals: * * @see setHighlightingEnabled() */ - void actiontqStatusText( const TQString &text ); + void actionStatusText( const TQString &text ); /** Emitted when an action loses highlighting. * This is only emitted if you have setHighlightingEnabled() * * @see setHighlightingEnabled() */ - void cleartqStatusText(); + void clearStatusText(); private: /** @@ -331,7 +331,7 @@ private slots: void slotDestroyed(); private: - KAction *tqfindAction( TQWidget *container, int id ); + KAction *findAction( TQWidget *container, int id ); #ifndef KDE_NO_COMPAT public: diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp index e0841bb06..c01a91d41 100644 --- a/kdeui/kactivelabel.cpp +++ b/kdeui/kactivelabel.cpp @@ -111,9 +111,9 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e ) } } -TQSize KActiveLabel::tqminimumSizeHint() const +TQSize KActiveLabel::minimumSizeHint() const { - TQSize ms = tqminimumSize(); + TQSize ms = minimumSize(); if ((ms.width() > 0) && (ms.height() > 0)) return ms; @@ -134,9 +134,9 @@ TQSize KActiveLabel::tqminimumSizeHint() const return TQSize(w, h); } -TQSize KActiveLabel::tqsizeHint() const +TQSize KActiveLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } #include "kactivelabel.moc" diff --git a/kdeui/kactivelabel.h b/kdeui/kactivelabel.h index a04e3af27..8ab2bacf2 100644 --- a/kdeui/kactivelabel.h +++ b/kdeui/kactivelabel.h @@ -56,8 +56,8 @@ public: */ KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0); - TQSize tqminimumSizeHint() const; - TQSize tqsizeHint() const; + TQSize minimumSizeHint() const; + TQSize sizeHint() const; public slots: /** diff --git a/kdeui/kanimwidget.cpp b/kdeui/kanimwidget.cpp index 1f1972ca4..5ff1037d5 100644 --- a/kdeui/kanimwidget.cpp +++ b/kdeui/kanimwidget.cpp @@ -74,7 +74,7 @@ void KAnimWidget::stop() { d->current_frame = 0; d->timer.stop(); - tqrepaint(); + repaint(); } void KAnimWidget::setSize( int size ) @@ -143,7 +143,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton && - rect().tqcontains( e->pos() ) ) + rect().contains( e->pos() ) ) emit clicked(); TQFrame::mouseReleaseEvent( e ); @@ -159,10 +159,10 @@ void KAnimWidget::slotTimerUpdate() d->current_frame = 0; // TODO - // We have to clear the widget when tqrepainting a transparent image + // We have to clear the widget when repainting a transparent image // By doing it like this we get a bit of flicker though. A better // way might be to merge it with the background in drawContents. - tqrepaint(d->transparent); + repaint(d->transparent); } void KAnimWidget::drawContents( TQPainter *p ) diff --git a/kdeui/karrowbutton.cpp b/kdeui/karrowbutton.cpp index 22d221bcb..fd9624b67 100644 --- a/kdeui/karrowbutton.cpp +++ b/kdeui/karrowbutton.cpp @@ -40,7 +40,7 @@ KArrowButton::~KArrowButton() delete d; } -TQSize KArrowButton::tqsizeHint() const +TQSize KArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a) { if (d->arrow != a) { d->arrow = a; - tqrepaint(); + repaint(); } } Qt::ArrowType KArrowButton::arrowType() const @@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p) const unsigned int arrowSize = 8; const unsigned int margin = 2; - p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); + p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), + colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default, TQStyleOption( 2, 0 ) ); @@ -104,7 +104,7 @@ void KArrowButton::drawButton(TQPainter *p) if ( isDown() ) flags |= TQStyle::Style_Down; style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), - tqcolorGroup(), flags ); + colorGroup(), flags ); } void KArrowButton::virtual_hook( int, void* ) diff --git a/kdeui/karrowbutton.h b/kdeui/karrowbutton.h index d85b6f914..e20278692 100644 --- a/kdeui/karrowbutton.h +++ b/kdeui/karrowbutton.h @@ -28,7 +28,7 @@ class KArrowButtonPrivate; * @short Draws a button with an arrow. * * Draws a button which shows an arrow pointing into a certain direction. The - * arrow's tqalignment on the button depends on the direction it's pointing to, + * arrow's alignment on the button depends on the direction it's pointing to, * e.g. a left arrow is aligned at the left border, a upwards arrow at the top * border. This class honors the currently configured KStyle when drawing * the arrow. @@ -59,7 +59,7 @@ class KDEUI_EXPORT KArrowButton : public QPushButton /** * Reimplemented from TQPushButton. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Returns the arrow type @@ -67,12 +67,12 @@ class KDEUI_EXPORT KArrowButton : public QPushButton */ Qt::ArrowType arrowType() const; - // hacks for tqmoc braindamages with enums + // hacks for moc braindamages with enums int arrowTp() const { return (int) arrowType(); } void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } public slots: /** - * Defines in what direction the arrow is pointing to. Will tqrepaint the + * Defines in what direction the arrow is pointing to. Will repaint the * button if necessary. * * @param a The direction this arrow should be pointing in diff --git a/kdeui/kauthicon.cpp b/kdeui/kauthicon.cpp index 2e9f2f69c..d4c18a114 100644 --- a/kdeui/kauthicon.cpp +++ b/kdeui/kauthicon.cpp @@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockBox = new TQLabel(this); lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised); lockBox->setPixmap(lockPM); - lockBox->setFixedSize(lockBox->tqsizeHint()); + lockBox->setFixedSize(lockBox->sizeHint()); lockLabel = new TQLabel(this); lockLabel->setFrameStyle(TQFrame::NoFrame); @@ -113,18 +113,18 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockLabel->setText(lockText); else lockLabel->setText(openLockText); - lockLabel->tqsetAlignment(AlignCenter); - lockLabel->setMinimumSize(lockLabel->tqsizeHint()); + lockLabel->setAlignment(AlignCenter); + lockLabel->setMinimumSize(lockLabel->sizeHint()); lockLabel->setText(lockText); - tqlayout = new TQHBoxLayout(this); + layout = new TQHBoxLayout(this); - tqlayout->addWidget(lockBox, 0, AlignLeft|AlignVCenter); - tqlayout->addSpacing(5); - tqlayout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); + layout->addWidget(lockBox, 0, AlignLeft|AlignVCenter); + layout->addSpacing(5); + layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); - tqlayout->activate(); - resize(tqsizeHint()); + layout->activate(); + resize(sizeHint()); } KAuthIcon::~KAuthIcon() @@ -132,9 +132,9 @@ KAuthIcon::~KAuthIcon() } -TQSize KAuthIcon::tqsizeHint() const +TQSize KAuthIcon::sizeHint() const { - return tqlayout->tqminimumSize(); + return layout->minimumSize(); } @@ -143,7 +143,7 @@ TQSize KAuthIcon::tqsizeHint() const KRootPermsIcon::KRootPermsIcon(TQWidget *parent, const char *name) : KAuthIcon(parent, name) { - updatetqStatus(); + updateStatus(); } @@ -151,7 +151,7 @@ KRootPermsIcon::~KRootPermsIcon() { } -void KRootPermsIcon::updatetqStatus() +void KRootPermsIcon::updateStatus() { const bool newRoot = (geteuid() == 0); lockBox->setPixmap(newRoot ? openLockPM : lockPM); @@ -170,7 +170,7 @@ KWritePermsIcon::KWritePermsIcon(const TQString & fileName, : KAuthIcon(parent, name) { fi.setFile(fileName); - updatetqStatus(); + updateStatus(); } @@ -178,7 +178,7 @@ KWritePermsIcon::~KWritePermsIcon() { } -void KWritePermsIcon::updatetqStatus() +void KWritePermsIcon::updateStatus() { bool newwrite; newwrite = fi.isWritable(); diff --git a/kdeui/kauthicon.h b/kdeui/kauthicon.h index 398d1fcb0..0bfe0cc22 100644 --- a/kdeui/kauthicon.h +++ b/kdeui/kauthicon.h @@ -55,7 +55,7 @@ public: KAuthIcon(TQWidget *parent = 0, const char *name = 0); ~KAuthIcon(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * return the status of whatever is being monitored. */ @@ -66,7 +66,7 @@ public slots: * Re-implement this method if you want the icon to update itself * when something external has changed (i.e. a file on disk, uid/gid). */ - virtual void updatetqStatus() = 0; + virtual void updateStatus() = 0; signals: /** @@ -78,7 +78,7 @@ signals: void authChanged(bool authorized); protected: - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; TQLabel *lockBox; TQLabel *lockLabel; @@ -114,7 +114,7 @@ public: bool status() const { return root; } public slots: - void updatetqStatus(); + void updateStatus(); protected: bool root; @@ -149,7 +149,7 @@ public: * make the icon watch a new filename. * @param fileName the new file to monitor / display status for. */ - void setFileName(const TQString & fileName) { fi.setFile(fileName); updatetqStatus(); } + void setFileName(const TQString & fileName) { fi.setFile(fileName); updateStatus(); } /** * return the filename of the currently watched file. @@ -158,7 +158,7 @@ public: TQString fileName() const { return fi.fileName(); } public slots: - void updatetqStatus(); + void updateStatus(); protected: bool writable; diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp index 28b917ed6..3d7898861 100644 --- a/kdeui/kbugreport.cpp +++ b/kdeui/kbugreport.cpp @@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWidget * parent = plainPage(); d->submitBugButton = 0; - //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ) + //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ) //{ // // This is a core KDE application -> redirect to the web form // Always redirect to the Web form for Trinity @@ -153,9 +153,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); - d->appname = TQString::tqfromLatin1( m_aboutData + d->appname = TQString::fromLatin1( m_aboutData ? m_aboutData->productName() - : tqApp->name() ); + : qApp->name() ); glay->addWidget( d->appcombo, row, 1 ); int index = 0; for (; index < d->appcombo->count(); index++) { @@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD m_strVersion = m_aboutData->version(); else m_strVersion = i18n("no version set (programmer error!)"); - d->kde_version = TQString::tqfromLatin1( KDE_VERSION_STRING ); - d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT ); + d->kde_version = TQString::fromLatin1( KDE_VERSION_STRING ); + d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT ); if ( !d->submitBugButton ) m_strVersion += " " + d->kde_version; m_version = new TQLabel( m_strVersion, parent ); @@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD struct utsname unameBuf; uname( &unameBuf ); - d->os = TQString::tqfromLatin1( unameBuf.sysname ) + - " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") " - "release " + TQString::tqfromLatin1( unameBuf.release ); + d->os = TQString::fromLatin1( unameBuf.sysname ) + + " (" + TQString::fromLatin1( unameBuf.machine ) + ") " + "release " + TQString::fromLatin1( unameBuf.release ); tmpLabel = new TQLabel(d->os, parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); tmpLabel = new TQLabel(i18n("Compiler:"), parent); glay->addWidget( tmpLabel, ++row, 0 ); - tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent); + tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); if ( !d->submitBugButton ) @@ -251,7 +251,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD lay->addSpacing(10); TQString text = i18n("To submit a bug report, click on the button below.\n" - "This will open a web browser window on http://bugs.pearsoncomputing.net where you will tqfind a form to fill in.\n" + "This will open a web browser window on http://bugs.pearsoncomputing.net where you will find a form to fill in.\n" "The information displayed above will be transferred to that server."); TQLabel * label = new TQLabel( text, parent, "label"); lay->addWidget( label ); @@ -259,7 +259,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD updateURL(); d->submitBugButton->setText( i18n("&Launch Bug Report Wizard") ); - d->submitBugButton->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + d->submitBugButton->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); lay->addWidget( d->submitBugButton ); lay->addSpacing(10); @@ -289,7 +289,7 @@ void KBugReport::updateURL() void KBugReport::appChanged(int i) { TQString appName = d->appcombo->text(i); - int index = appName.tqfind( '/' ); + int index = appName.find( '/' ); if ( index > 0 ) appName = appName.left( index ); kdDebug() << "appName " << appName << endl; @@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail() { if (m_process) return; m_process = new KProcess; - *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { @@ -330,24 +330,24 @@ void KBugReport::slotSetFrom() m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::tqfromLatin1("emaildefaults") ); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); - // tqfind out the default profile - emailConf.setGroup( TQString::tqfromLatin1("Defaults") ); - TQString profile = TQString::tqfromLatin1("PROFILE_"); - profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"), - TQString::tqfromLatin1("Default") ); + // find out the default profile + emailConf.setGroup( TQString::fromLatin1("Defaults") ); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry( TQString::fromLatin1("Profile"), + TQString::fromLatin1("Default") ); emailConf.setGroup( profile ); - TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") ); + TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") ); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::tqfromLatin1(p->pw_name); + fromaddr = TQString::fromLatin1(p->pw_name); } else { - TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName")); + TQString name = emailConf.readEntry( TQString::fromLatin1("FullName")); if (!name.isEmpty()) - fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); + fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); } m_from->setText( fromaddr ); } @@ -438,9 +438,9 @@ TQString KBugReport::text() const { kdDebug() << m_bgSeverity->selected()->name() << endl; // Prepend the pseudo-headers to the contents of the mail - TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name()); + TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name()); TQString appname = d->appcombo->currentText(); - TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n"). + TQString os = TQString::fromLatin1("OS: %1 (%2)\n"). arg(KDE_COMPILING_OS). arg(KDE_DISTRIBUTION_TEXT); TQString bodyText; @@ -452,25 +452,25 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language()); - package = package.tqreplace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); - return TQString::tqfromLatin1("Package: %1").arg(package) + - TQString::tqfromLatin1("\n" + TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); + return TQString::fromLatin1("Package: %1").arg(package) + + TQString::fromLatin1("\n" "Application: %1\n" // not really i18n's version, so better here IMHO "Version: %2\n").arg(appname).arg(m_strVersion)+ - os+TQString::tqfromLatin1("\n")+bodyText; + os+TQString::fromLatin1("\n")+bodyText; } else { - appname = appname.tqreplace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); + appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); // Case 2 : normal bug - return TQString::tqfromLatin1("Package: %1\n" + return TQString::fromLatin1("Package: %1\n" "Version: %2\n" "Severity: %3\n") .arg(appname).arg(m_strVersion).arg(severity)+ - TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ - os+TQString::tqfromLatin1("\n")+bodyText; + TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ + os+TQString::fromLatin1("\n")+bodyText; } } @@ -478,12 +478,12 @@ bool KBugReport::sendBugReport() { TQString recipient ( m_aboutData ? m_aboutData->bugAddress() : - TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ); + TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ); TQString command; command = locate("exe", "ksendbugmail"); if (command.isEmpty()) - command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") ); + command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") ); KTempFile outputfile; outputfile.close(); diff --git a/kdeui/kbuttonbox.cpp b/kdeui/kbuttonbox.cpp index dc5f2674b..eb0e27827 100644 --- a/kdeui/kbuttonbox.cpp +++ b/kdeui/kbuttonbox.cpp @@ -20,7 +20,7 @@ /* * KButtonBox class * - * A container widget for buttons. Uses Qt tqlayout control to place the + * A container widget for buttons. Uses Qt layout control to place the * buttons, can handle both vertical and horizontal button placement. * * HISTORY @@ -39,7 +39,7 @@ * which makes the buttons look better. * * 01/17/98 Mario Weilguni - * Fixed a bug in tqsizeHint() + * Fixed a bug in sizeHint() * Improved the handling of Motif default buttons * * 01/09/98 Mario Weilguni @@ -160,7 +160,7 @@ void KButtonBox::addStretch(int scale) { } } -void KButtonBox::tqlayout() { +void KButtonBox::layout() { // resize all buttons const TQSize bs = bestButtonSize(); @@ -178,7 +178,7 @@ void KButtonBox::tqlayout() { ++itr; } - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } void KButtonBox::placeButtons() { @@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const { return s; } -TQSize KButtonBox::tqsizeHint() const { +TQSize KButtonBox::sizeHint() const { unsigned int dw; if(data->buttons.isEmpty()) @@ -355,8 +355,8 @@ TQSizePolicy KButtonBox::sizePolicy() const * as minimum width */ TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const { - TQSize s = b->tqsizeHint(); - const TQSize ms = b->tqminimumSize(); + TQSize s = b->sizeHint(); + const TQSize ms = b->minimumSize(); if(s.width() < minButtonWidth) s.setWidth(minButtonWidth); diff --git a/kdeui/kbuttonbox.h b/kdeui/kbuttonbox.h index 0d4b36b67..7eda45577 100644 --- a/kdeui/kbuttonbox.h +++ b/kdeui/kbuttonbox.h @@ -30,9 +30,9 @@ class KButtonBoxPrivate; /** * Container widget for buttons. * - * This class uses Qt tqlayout control to place the buttons; can handle + * This class uses Qt layout control to place the buttons; can handle * both vertical and horizontal button placement. The default border - * is now @p 0 (making it easier to deal with tqlayouts). The space + * is now @p 0 (making it easier to deal with layouts). The space * between buttons is now more Motif compliant. * * @author Mario Weilguni @@ -65,7 +65,7 @@ public: * This size is * calculated by the width/height of all buttons plus border/autoborder. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent *); @@ -146,9 +146,9 @@ public: * This function must be called @em once after all buttons have been * inserted. * - * It will start tqlayout control. + * It will start layout control. */ - void tqlayout(); + void layout(); public: // as PrivateData needs Item, it has to be exported class Item; diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp index a0486b42f..1eb707c4d 100644 --- a/kdeui/kcharselect.cpp +++ b/kdeui/kcharselect.cpp @@ -45,7 +45,7 @@ class KCharSelect::KCharSelectPrivate { public: - TQLineEdit *tqunicodeLine; + TQLineEdit *unicodeLine; }; TQFontDatabase * KCharSelect::fontDataBase = 0; @@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ : TQGridView( parent, name ), vFont( _font ), vChr( _chr ), vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0) { - setBackgroundColor( tqcolorGroup().base() ); + setBackgroundColor( colorGroup().base() ); setCellWidth( 20 ); setCellHeight( 25 ); @@ -74,7 +74,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ setNumCols( 32 ); setNumRows( 8 ); - tqrepaintContents( false ); + repaintContents( false ); setToolTips(); @@ -86,7 +86,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ void KCharSelectTable::setFont( const TQString &_font ) { vFont = _font; - tqrepaintContents( false ); + repaintContents( false ); setToolTips(); } @@ -95,7 +95,7 @@ void KCharSelectTable::setFont( const TQString &_font ) void KCharSelectTable::setChar( const TQChar &_chr ) { vChr = _chr; - tqrepaintContents( false ); + repaintContents( false ); } //================================================================== @@ -104,13 +104,13 @@ void KCharSelectTable::setTableNum( int _tableNum ) focusItem = TQChar( _tableNum * 256 ); vTableNum = _tableNum; - tqrepaintContents( false ); + repaintContents( false ); setToolTips(); } //================================================================== -TQSize KCharSelectTable::tqsizeHint() const +TQSize KCharSelectTable::sizeHint() const { int w = cellWidth(); int h = cellHeight(); @@ -155,26 +155,26 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) c += row * numCols(); c += col; - if ( c == vChr.tqunicode() ) { - p->setBrush( TQBrush( tqcolorGroup().highlight() ) ); + if ( c == vChr.unicode() ) { + p->setBrush( TQBrush( colorGroup().highlight() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( tqcolorGroup().highlightedText() ); + p->setPen( colorGroup().highlightedText() ); vPos = TQPoint( col, row ); } else { TQFontMetrics fm = TQFontMetrics( font ); if( fm.inFont( c ) ) - p->setBrush( TQBrush( tqcolorGroup().base() ) ); + p->setBrush( TQBrush( colorGroup().base() ) ); else - p->setBrush( TQBrush( tqcolorGroup().button() ) ); + p->setBrush( TQBrush( colorGroup().button() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( tqcolorGroup().text() ); + p->setPen( colorGroup().text() ); } - if ( c == focusItem.tqunicode() && hasFocus() ) { + if ( c == focusItem.unicode() && hasFocus() ) { style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), - tqcolorGroup() ); + colorGroup() ); focusPos = TQPoint( col, row ); } @@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) ); - p->setPen( tqcolorGroup().text() ); + p->setPen( colorGroup().text() ); p->drawLine( x2, 0, x2, y2 ); p->drawLine( 0, y2, x2, y2 ); @@ -210,9 +210,9 @@ void KCharSelectTable::mouseMoveEvent( TQMouseEvent *e ) focusPos = vPos; focusItem = vChr; - tqrepaintCell( oldFocus.y(), oldFocus.x(), true ); - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( vPos.y(), vPos.x(), true ); + repaintCell( oldFocus.y(), oldFocus.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( vPos.y(), vPos.x(), true ); emit highlighted( vChr ); emit highlighted(); @@ -256,8 +256,8 @@ void KCharSelectTable::keyPressEvent( TQKeyEvent *e ) vPos = focusPos; vChr = focusItem; - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( vPos.y(), vPos.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( vPos.y(), vPos.x(), true ); emit activated( vChr ); emit activated(); @@ -277,8 +277,8 @@ void KCharSelectTable::gotoLeft() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( focusPos.y(), focusPos.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -295,8 +295,8 @@ void KCharSelectTable::gotoRight() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( focusPos.y(), focusPos.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -313,8 +313,8 @@ void KCharSelectTable::gotoUp() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( focusPos.y(), focusPos.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -331,8 +331,8 @@ void KCharSelectTable::gotoDown() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - tqrepaintCell( oldPos.y(), oldPos.x(), true ); - tqrepaintCell( focusPos.y(), focusPos.x(), true ); + repaintCell( oldPos.y(), oldPos.x(), true ); + repaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -381,41 +381,41 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f bar->setSpacing( KDialog::spacingHint() ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); - lFont->resize( lFont->tqsizeHint() ); - lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lFont->setMaximumWidth( lFont->tqsizeHint().width() ); + lFont->resize( lFont->sizeHint() ); + lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setMaximumWidth( lFont->sizeHint().width() ); fontCombo = new TQComboBox( true, bar ); fillFontCombo(); - fontCombo->resize( fontCombo->tqsizeHint() ); + fontCombo->resize( fontCombo->sizeHint() ); connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); - lTable->resize( lTable->tqsizeHint() ); - lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lTable->setMaximumWidth( lTable->tqsizeHint().width() ); + lTable->resize( lTable->sizeHint() ); + lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setMaximumWidth( lTable->sizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); - tableSpinBox->resize( tableSpinBox->tqsizeHint() ); + tableSpinBox->resize( tableSpinBox->sizeHint() ); connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); - lUnicode->resize( lUnicode->tqsizeHint() ); - lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() ); + lUnicode->resize( lUnicode->sizeHint() ); + lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); TQValidator* const validator = new TQRegExpValidator( rx, this ); - d->tqunicodeLine = new KLineEdit( bar ); - d->tqunicodeLine->setValidator(validator); - lUnicode->setBuddy(d->tqunicodeLine); - d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() ); + d->unicodeLine = new KLineEdit( bar ); + d->unicodeLine->setValidator(validator); + lUnicode->setBuddy(d->unicodeLine); + d->unicodeLine->resize( d->unicodeLine->sizeHint() ); slotUpdateUnicode(_chr); - connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQVBox::font().family() : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , @@ -452,15 +452,15 @@ KCharSelect::~KCharSelect() } //================================================================== -TQSize KCharSelect::tqsizeHint() const +TQSize KCharSelect::sizeHint() const { - return TQVBox::tqsizeHint(); + return TQVBox::sizeHint(); } //================================================================== void KCharSelect::setFont( const TQString &_font ) { - const TQValueList::Iterator it = fontList.tqfind( _font ); + const TQValueList::Iterator it = fontList.find( _font ); if ( it != fontList.end() ) { TQValueList::Iterator it2 = fontList.begin(); int pos = 0; @@ -469,7 +469,7 @@ void KCharSelect::setFont( const TQString &_font ) charTable->setFont( _font ); } else - kdWarning() << "Can't tqfind Font: " << _font << endl; + kdWarning() << "Can't find Font: " << _font << endl; } //================================================================== @@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value ) //================================================================== void KCharSelect::slotUnicodeEntered( ) { - const TQString s = d->tqunicodeLine->text(); + const TQString s = d->unicodeLine->text(); if (s.isEmpty()) return; @@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( ) void KCharSelect::slotUpdateUnicode( const TQChar &c ) { - const int uc = c.tqunicode(); + const int uc = c.unicode(); TQString s; s.sprintf("%04X", uc); - d->tqunicodeLine->setText(s); + d->unicodeLine->setText(s); } void KCharSelectTable::virtual_hook( int, void*) diff --git a/kdeui/kcharselect.h b/kdeui/kcharselect.h index 79ea61820..526d594b6 100644 --- a/kdeui/kcharselect.h +++ b/kdeui/kcharselect.h @@ -56,7 +56,7 @@ public: KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, int _tableNum ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void resizeEvent( TQResizeEvent * ); virtual void setFont( const TQString &_font ); @@ -127,7 +127,7 @@ private: * KCharSelect supports keyboard and mouse navigation. Click+Move * always selects the character below the mouse cursor. Using the * arrow keys moves the focus mark around and pressing RETURN - * or SPACE selects the cell which tqcontains the focus mark. + * or SPACE selects the cell which contains the focus mark. * * To get the current selected character, use the chr() * method. You can set the character which should be displayed with @@ -157,7 +157,7 @@ public: /** * Reimplemented. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Sets the font which is displayed to @p font diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp index d0774ae44..9cd9d6288 100644 --- a/kdeui/kcmenumngr.cpp +++ b/kdeui/kcmenumngr.cpp @@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ; - menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt(); - saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ; - showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true ); + KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; + menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); + saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; + showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); } KContextMenuManager::~KContextMenuManager() @@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) void KContextMenuManager::widgetDestroyed() { - if ( menus.tqfind( (TQObject*)sender() ) ) + if ( menus.find( (TQObject*)sender() ) ) menus.remove( (TQObject*)sender() ); } diff --git a/kdeui/kcmenumngr.h b/kdeui/kcmenumngr.h index 63a3217e6..cd478e494 100644 --- a/kdeui/kcmenumngr.h +++ b/kdeui/kcmenumngr.h @@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ). */ -class KDEUI_EXPORT KContextMenuManager : public TQObject +class KDEUI_EXPORT KContextMenuManager : public QObject { Q_OBJECT public: diff --git a/kdeui/kcmodule.h b/kdeui/kcmodule.h index 54c4af6e3..3791f950a 100644 --- a/kdeui/kcmodule.h +++ b/kdeui/kcmodule.h @@ -49,7 +49,7 @@ class KInstance; * the module author. * * To write a config module, you have to create a library - * that tqcontains at one factory function like this: + * that contains at one factory function like this: * * \code * #include @@ -312,7 +312,7 @@ protected: * Sets the RootOnly message. * * This message will be shown at the top of the module of the - * corresponding desktop file tqcontains the line X-KDE-RootOnly=true. + * corresponding desktop file contains the line X-KDE-RootOnly=true. * If no message is set, a default one will be used. * * @see KCModule::rootOnlyMsg diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp index e4d8f3340..3cccbe1df 100644 --- a/kdeui/kcolorbutton.cpp +++ b/kdeui/kcolorbutton.cpp @@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c ) { if ( col != c ) { col = c; - tqrepaint( false ); + repaint( false ); emit changed( col ); } } @@ -108,29 +108,29 @@ void KColorButton::drawButtonLabel( TQPainter *painter ) TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = style().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } TQColor fillCol = isEnabled() ? col : backgroundColor(); - qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); if ( fillCol.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, fillCol ); if ( hasFocus() ) { TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } -TQSize KColorButton::tqsizeHint() const +TQSize KColorButton::sizeHint() const { return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). expandedTo(TQApplication::globalStrut()); @@ -153,11 +153,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e ) { KKey key( e ); - if ( KStdAccel::copy().tqcontains( key ) ) { + if ( KStdAccel::copy().contains( key ) ) { TQMimeSource* mime = new KColorDrag( color() ); TQApplication::clipboard()->setData( mime, QClipboard::Clipboard ); } - else if ( KStdAccel::paste().tqcontains( key ) ) { + else if ( KStdAccel::paste().contains( key ) ) { TQColor color; KColorDrag::decode( TQApplication::clipboard()->data( QClipboard::Clipboard ), color ); setColor( color ); diff --git a/kdeui/kcolorbutton.h b/kdeui/kcolorbutton.h index ebd4ece58..cff929156 100644 --- a/kdeui/kcolorbutton.h +++ b/kdeui/kcolorbutton.h @@ -80,7 +80,7 @@ public: */ void setDefaultColor( const TQColor &c ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: /** diff --git a/kdeui/kcolorcombo.cpp b/kdeui/kcolorcombo.cpp index 4f9f35713..c418b6a81 100644 --- a/kdeui/kcolorcombo.cpp +++ b/kdeui/kcolorcombo.cpp @@ -21,10 +21,10 @@ // // 1999-09-27 Espen Sand // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that in tqcontains a parent argument. This +// KColorDialog::getColor() so that in contains a parent argument. This // improves centering capability. // -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // // @@ -175,7 +175,7 @@ void KColorCombo::slotActivated( int index ) TQRect rect( 0, 0, width(), TQFontMetrics(painter.font()).height()+4); TQPixmap pixmap( rect.width(), rect.height() ); - if ( tqGray( customColor.rgb() ) < 128 ) + if ( qGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -228,7 +228,7 @@ void KColorCombo::addColors() if ( i == STANDARD_PAL_SIZE ) customColor = internalcolor; - if ( tqGray( customColor.rgb() ) < 128 ) + if ( qGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); diff --git a/kdeui/kcolorcombo.h b/kdeui/kcolorcombo.h index fcbfda4cf..8ef33f5c9 100644 --- a/kdeui/kcolorcombo.h +++ b/kdeui/kcolorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp index 5b9596e2a..64decd2c5 100644 --- a/kdeui/kcolordialog.cpp +++ b/kdeui/kcolordialog.cpp @@ -21,10 +21,10 @@ // // 1999-09-27 Espen Sand // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that it tqcontains a parent argument. This +// KColorDialog::getColor() so that it contains a parent argument. This // improves centering capability. // -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // // @@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col ) if (shade) { qDrawShadePanel( painter, 1, 1, cellWidth()-2, - cellHeight()-2, tqcolorGroup(), true, 1, &brush ); + cellHeight()-2, colorGroup(), true, 1, &brush ); w = 2; } TQColor color = colors[ row * numCols() + col ]; @@ -565,7 +565,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) TQStringList diskPaletteList = KPalette::getPaletteList(); TQStringList paletteList; - // We must tqreplace the untranslated file names by translate names (of course only for KDE's standard palettes) + // We must replace the untranslated file names by translate names (of course only for KDE's standard palettes) for ( int i = 0; colorPaletteName[i].m_fileName; ++i ) { diskPaletteList.remove( colorPaletteName[i].m_fileName ); @@ -574,11 +574,11 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) paletteList += diskPaletteList; paletteList.append( i18n_namedColors ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); combo->insertStringList( paletteList ); - tqlayout->addWidget(combo); + layout->addWidget(combo); sv = new TQScrollView( this ); TQSize cellSize = TQSize( mMinWidth, 120); @@ -588,16 +588,16 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) minSize += TQSize(sv->frameWidth(), 0); minSize += TQSize(cellSize); sv->setFixedSize(minSize); - tqlayout->addWidget(sv); + layout->addWidget(sv); mNamedColorList = new KListBox( this, "namedColorList", 0 ); mNamedColorList->setFixedSize(minSize); mNamedColorList->hide(); - tqlayout->addWidget(mNamedColorList); + layout->addWidget(mNamedColorList); connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); - setFixedSize( tqsizeHint()); + setFixedSize( sizeHint()); connect( combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette( const TQString &))); } @@ -674,8 +674,8 @@ KPaletteTable::readNamedColor( void ) // that start with "gray". // TQString name = line.mid(pos).stripWhiteSpace(); - if( name.isNull() || name.tqfind(' ') != -1 || - name.tqfind( "gray" ) != -1 || name.tqfind( "grey" ) != -1 ) + if( name.isNull() || name.find(' ') != -1 || + name.find( "gray" ) != -1 || name.find( "grey" ) != -1 ) { continue; } @@ -782,7 +782,7 @@ KPaletteTable::setPalette( const TQString &_paletteName ) } } - // We must again tqfind the file name of the palette from the eventual translation + // We must again find the file name of the palette from the eventual translation for ( int i = 0; colorPaletteName[i].m_fileName; ++i ) { if ( paletteName == i18n( "palette name", colorPaletteName[i].m_displayName ) ) @@ -926,7 +926,7 @@ public: KPalette *palette; KValueSelector *valuePal; TQVBoxLayout* l_right; - TQGridLayout* tl_tqlayout; + TQGridLayout* tl_layout; TQCheckBox *cbDefaultColor; KColor defaultColor; KColor selColor; @@ -954,21 +954,21 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQLabel *label; // - // Create the top level page and its tqlayout + // Create the top level page and its layout // TQWidget *page = new TQWidget( this ); setMainWidget( page ); - TQGridLayout *tl_tqlayout = new TQGridLayout( page, 3, 3, 0, spacingHint() ); - d->tl_tqlayout = tl_tqlayout; - tl_tqlayout->addColSpacing( 1, spacingHint() * 2 ); + TQGridLayout *tl_layout = new TQGridLayout( page, 3, 3, 0, spacingHint() ); + d->tl_layout = tl_layout; + tl_layout->addColSpacing( 1, spacingHint() * 2 ); // // the more complicated part: the left side // add a V-box // TQVBoxLayout *l_left = new TQVBoxLayout(); - tl_tqlayout->addLayout(l_left, 0, 0); + tl_layout->addLayout(l_left, 0, 0); // // add a H-Box for the XY-Selector and a grid for the @@ -1003,7 +1003,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the HSV fields // label = new TQLabel( i18n("H:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); d->hedit->setValidator( new TQIntValidator( d->hedit ) ); @@ -1012,7 +1012,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); d->sedit->setValidator( new TQIntValidator( d->sedit ) ); @@ -1021,7 +1021,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); d->vedit->setValidator( new TQIntValidator( d->vedit ) ); @@ -1033,7 +1033,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the RGB fields // label = new TQLabel( i18n("R:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); d->redit->setValidator( new TQIntValidator( d->redit ) ); @@ -1042,7 +1042,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); d->gedit->setValidator( new TQIntValidator( d->gedit ) ); @@ -1051,7 +1051,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); d->bedit->setValidator( new TQIntValidator( d->bedit ) ); @@ -1072,10 +1072,10 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->bedit->setFixedWidth(w); // - // add a tqlayout for the right side + // add a layout for the right side // d->l_right = new TQVBoxLayout; - tl_tqlayout->addLayout(d->l_right, 0, 2); + tl_layout->addLayout(d->l_right, 0, 2); // // Add the palette table @@ -1143,7 +1143,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size - w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD")); + w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); l_grid->addWidget(d->htmlName, 1, 2, AlignLeft); @@ -1156,8 +1156,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); - tl_tqlayout->activate(); - page->setMinimumSize( page->tqsizeHint() ); + tl_layout->activate(); + page->setMinimumSize( page->sizeHint() ); readSettings(); d->bRecursion = false; @@ -1195,7 +1195,7 @@ KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) case TQEvent::DragLeave: case TQEvent::Drop: case TQEvent::DragResponse: - tqApp->sendEvent(d->patch, ev); + qApp->sendEvent(d->patch, ev); return true; default: break; @@ -1222,8 +1222,8 @@ KColorDialog::setDefaultColor( const TQColor& col ) d->l_right->addWidget( d->cbDefaultColor ); mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize() - d->tl_tqlayout->activate(); - mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() ); + d->tl_layout->activate(); + mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); disableResize(); connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); @@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name ) d->valuePal->setValue( v ); d->valuePal->updateContents(); d->valuePal->blockSignals(false); - d->valuePal->tqrepaint( false ); + d->valuePal->repaint( false ); d->bRecursion = false; } diff --git a/kdeui/kcolordialog.h b/kdeui/kcolordialog.h index 9fa2a05a9..c3a6fabf3 100644 --- a/kdeui/kcolordialog.h +++ b/kdeui/kcolordialog.h @@ -19,7 +19,7 @@ //---------------------------------------------------------------------- // KDE color selection dialog. -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // #ifndef KDELIBS_KCOLORDIALOG_H diff --git a/kdeui/kcolordrag.cpp b/kdeui/kcolordrag.cpp index d364b585e..1c56d9ccd 100644 --- a/kdeui/kcolordrag.cpp +++ b/kdeui/kcolordrag.cpp @@ -40,7 +40,7 @@ void KColorDrag::setColor( const TQColor &color) { TQColorDrag tmp(color, 0, 0); - setEncodedData(tmp.tqencodedData(color_mime_string)); + setEncodedData(tmp.encodedData(color_mime_string)); TQPixmap colorpix( 25, 20); colorpix.fill( color); @@ -59,7 +59,7 @@ const char *KColorDrag::format(int i) const return TQStoredDrag::format(i); } -TQByteArray KColorDrag::tqencodedData ( const char * m ) const +TQByteArray KColorDrag::encodedData ( const char * m ) const { if (!qstrcmp(m, text_mime_string) ) { @@ -69,7 +69,7 @@ TQByteArray KColorDrag::tqencodedData ( const char * m ) const ((TQByteArray&)result).resize(result.length()); return result; } - return TQStoredDrag::tqencodedData(m); + return TQStoredDrag::encodedData(m); } bool @@ -91,8 +91,8 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color) if (TQColorDrag::decode(e, color)) return true; - TQByteArray data = e->tqencodedData( text_mime_string); - TQString colorName = TQString::tqfromLatin1(data.data(), data.size()); + TQByteArray data = e->encodedData( text_mime_string); + TQString colorName = TQString::fromLatin1(data.data(), data.size()); if ((colorName.length() < 4) || (colorName[0] != '#')) return false; color.setNamedColor(colorName); diff --git a/kdeui/kcolordrag.h b/kdeui/kcolordrag.h index 3cec28f7c..7f0cd1ba3 100644 --- a/kdeui/kcolordrag.h +++ b/kdeui/kcolordrag.h @@ -48,14 +48,14 @@ public: virtual ~KColorDrag() {} virtual const char *format(int i) const; - virtual TQByteArray tqencodedData ( const char * m ) const; + virtual TQByteArray encodedData ( const char * m ) const; /** * Sets the color of the drag to @p col. */ void setColor(const TQColor &col); /** - * Returns true if the MIME source @p e tqcontains a color object. + * Returns true if the MIME source @p e contains a color object. */ static bool canDecode(TQMimeSource *e); /** diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp index e4188c9c8..c3cc4c402 100644 --- a/kdeui/kcombobox.cpp +++ b/kdeui/kcombobox.cpp @@ -91,7 +91,7 @@ void KComboBox::init() } -bool KComboBox::tqcontains( const TQString& _text ) const +bool KComboBox::contains( const TQString& _text ) const { if ( _text.isEmpty() ) return false; @@ -163,7 +163,7 @@ void KComboBox::makeCompletion( const TQString& text ) if( text.isNull() || !listBox() ) return; - const int index = listBox()->index( listBox()->tqfindItem( text ) ); + const int index = listBox()->index( listBox()->findItem( text ) ); if( index >= 0 ) setCurrentItem( index ); } @@ -508,7 +508,7 @@ void KHistoryCombo::addToHistory( const TQString& item ) // anymore available at all in the combobox. const TQString rmItem = text( rmIndex ); removeItem( rmIndex ); - if ( useComp && !tqcontains( rmItem ) ) + if ( useComp && !contains( rmItem ) ) completionObject()->removeItem( rmItem ); } @@ -616,12 +616,12 @@ void KHistoryCombo::keyPressEvent( TQKeyEvent *e ) KKey event_key( e ); // going up in the history, rotating when reaching TQListBox::count() - if ( KStdAccel::rotateUp().tqcontains(event_key) ) + if ( KStdAccel::rotateUp().contains(event_key) ) rotateUp(); // going down in the history, no rotation possible. Last item will be // the text that was in the lineedit before Up was called. - else if ( KStdAccel::rotateDown().tqcontains(event_key) ) + else if ( KStdAccel::rotateDown().contains(event_key) ) rotateDown(); else KComboBox::keyPressEvent( e ); @@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget new TQListViewItem( m_pListView, *it ); } - m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); + m_pListView->setMinimumSize( m_pListView->sizeHint() ); connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); - resize( tqsizeHint() ); + resize( sizeHint() ); } KHistoryComboEditor::~KHistoryComboEditor() diff --git a/kdeui/kcombobox.h b/kdeui/kcombobox.h index 0a23fe85a..d7d07e4b6 100644 --- a/kdeui/kcombobox.h +++ b/kdeui/kcombobox.h @@ -234,7 +234,7 @@ public: * * If @p true, the completion mode will be set to automatic. * Otherwise, it is defaulted to the global setting. This - * method has been tqreplaced by the more comprehensive + * method has been replaced by the more comprehensive * setCompletionMode(). * * @param autocomplete Flag to enable/disable automatic completion mode. @@ -245,7 +245,7 @@ public: * Re-implemented from TQComboBox. * * Returns @p true if the current completion mode is set - * to automatic. See its more comprehensive tqreplacement + * to automatic. See its more comprehensive replacement * completionMode(). * * @return @p true when completion mode is automatic. @@ -299,7 +299,7 @@ public: * * @return @p true if an item with the string @p text is in the combobox. */ - bool tqcontains( const TQString& text ) const; + bool contains( const TQString& text ) const; /** * By default, KComboBox recognizes Key_Return and Key_Enter @@ -360,7 +360,7 @@ signals: * Emitted when the user presses the Enter key. * * The argument is the current text being edited. This signal is just like - * returnPressed() except it tqcontains the current text as its argument. + * returnPressed() except it contains the current text as its argument. * * Note that this signal is only emitted when the * widget is editable. diff --git a/kdeui/kcommand.cpp b/kdeui/kcommand.cpp index 4960c8016..2c76b21cd 100644 --- a/kdeui/kcommand.cpp +++ b/kdeui/kcommand.cpp @@ -133,7 +133,7 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) { return; int index; - if(d->m_present && (index=m_commands.tqfindRef(d->m_present))!=-1) { + if(d->m_present && (index=m_commands.findRef(d->m_present))!=-1) { if (m_first) --index; m_commands.insert(index+1, command); @@ -192,7 +192,7 @@ void KCommandHistory::undo() { m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name())); } int index; - if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()) { + if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()) { d->m_present=m_commands.current(); if (m_undo) { m_undo->setEnabled(true); @@ -226,7 +226,7 @@ void KCommandHistory::redo() { if(!d->m_savedAt) emit documentRestored(); } - else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()) { + else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()) { d->m_present=m_commands.current(); d->m_present->execute(); emit commandExecuted(); @@ -257,7 +257,7 @@ void KCommandHistory::redo() { void KCommandHistory::documentSaved() { if(d->m_present && !m_first) - d->m_savedAt=m_commands.tqfindRef(d->m_present); + d->m_savedAt=m_commands.findRef(d->m_present); else if(!d->m_present && !m_first) d->m_savedAt=-42; // this value signals that the document has // been saved with an empty history. @@ -287,7 +287,7 @@ void KCommandHistory::clipCommands() { if(count<=m_undoLimit && count<=m_redoLimit) return; - int index=m_commands.tqfindRef(d->m_present); + int index=m_commands.findRef(d->m_present); if(index>=m_undoLimit) { for(int i=0; i<=(index-m_undoLimit); ++i) { m_commands.removeFirst(); @@ -295,7 +295,7 @@ void KCommandHistory::clipCommands() { if(d->m_savedAt==-1) d->m_savedAt=-42; } - index=m_commands.tqfindRef(d->m_present); // calculate the new + index=m_commands.findRef(d->m_present); // calculate the new count=m_commands.count(); // values (for the redo-branch :) // make it easier for us... d->m_savedAt==-1 -> invalid if(d->m_savedAt!=-42 && d->m_savedAt<-1) @@ -316,7 +316,7 @@ void KCommandHistory::slotUndoAboutToShow() { m_undoPopup->clear(); int i = 0; - if (m_commands.tqfindRef(d->m_present)!=-1) + if (m_commands.findRef(d->m_present)!=-1) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ ); @@ -340,7 +340,7 @@ void KCommandHistory::slotRedoAboutToShow() d->m_present = m_commands.first(); m_redoPopup->insertItem( i18n("Redo: %1").arg(d->m_present->name()), i++ ); } - if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()) + if (m_commands.findRef(d->m_present)!=-1 && m_commands.next()) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ ); @@ -360,7 +360,7 @@ void KCommandHistory::updateActions() if ( m_undo && m_redo ) { m_undo->setEnabled( !m_first && ( d->m_present ) ); - m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())); + m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next())); } } diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h index a9b8e4f6c..97fa3c2e2 100644 --- a/kdeui/kcommand.h +++ b/kdeui/kcommand.h @@ -180,7 +180,7 @@ public: /** * Erases all the undo/redo history. - * Use this when reloading the data, for instance, since this tqinvalidates + * Use this when reloading the data, for instance, since this invalidates * all the commands. */ void clear(); diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp index c830a7b21..ed75ecd21 100644 --- a/kdeui/kcompletionbox.cpp +++ b/kdeui/kcompletionbox.cpp @@ -231,7 +231,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) // any mouse-click on something else than "this" makes us hide else if ( type == TQEvent::MouseButtonPress ) { TQMouseEvent *ev = static_cast( e ); - if ( !rect().tqcontains( ev->pos() )) // this widget + if ( !rect().contains( ev->pos() )) // this widget hide(); if ( !d->emitSelected && currentItem() && !::qt_cast(o) ) @@ -260,7 +260,7 @@ void KCompletionBox::popup() clearSelection(); if ( !isVisible() ) show(); - else if ( size().height() != tqsizeHint().height() ) + else if ( size().height() != sizeHint().height() ) sizeAndPosition(); } } @@ -302,7 +302,7 @@ void KCompletionBox::show() d->upwardBox = false; if ( d->m_parent ) { sizeAndPosition(); - tqApp->installEventFilter( this ); + qApp->installEventFilter( this ); } // ### we shouldn't need to call this, but without this, the scrollbars @@ -310,21 +310,21 @@ void KCompletionBox::show() //triggerUpdate( true ); // Workaround for I'm not sure whose bug - if this KCompletionBox' parent - // is in a tqlayout, that tqlayout will detect inserting new child (posted - // ChildInserted event), and will trigger retqlayout (post LayoutHint event). + // is in a layout, that layout will detect inserting new child (posted + // ChildInserted event), and will trigger relayout (post LayoutHint event). // TQWidget::show() sends also posted ChildInserted events for the parent, - // and later all LayoutHint events, which causes tqlayout updating. + // and later all LayoutHint events, which causes layout updating. // The problem is, KCompletionBox::eventFilter() detects resizing // of the parent, and calls hide() - and this hide() happen in the middle // of show(), causing inconsistent state. I'll try to submit a Qt patch too. - tqApp->sendPostedEvents(); + qApp->sendPostedEvents(); KListBox::show(); } void KCompletionBox::hide() { if ( d->m_parent ) - tqApp->removeEventFilter( this ); + qApp->removeEventFilter( this ); d->cancelText = TQString::null; KListBox::hide(); } @@ -335,8 +335,8 @@ TQRect KCompletionBox::calculateGeometry() const int ih = itemHeight(); int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth(); - int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width(); - w = QMAX( KListBox::tqminimumSizeHint().width(), w ); + int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width(); + w = QMAX( KListBox::minimumSizeHint().width(), w ); //If we're inside a combox, Qt by default makes the dropdown // as wide as the combo, and gives the style a chance @@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const return TQRect(x, y, w, h); } -TQSize KCompletionBox::tqsizeHint() const +TQSize KCompletionBox::sizeHint() const { return calculateGeometry().size(); } @@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items ) } else { //Keep track of whether we need to change anything, - //so we can avoid a tqrepaint for identical updates, + //so we can avoid a repaint for identical updates, //to reduce flicker bool dirty = false; @@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != tqsizeHint().height() ) + if ( isVisible() && size().height() != sizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/kdeui/kcompletionbox.h b/kdeui/kcompletionbox.h index da6ecf49b..4e981bf86 100644 --- a/kdeui/kcompletionbox.h +++ b/kdeui/kcompletionbox.h @@ -61,7 +61,7 @@ public: */ ~KCompletionBox(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * @returns true if selecting an item results in the emition of the selected signal. @@ -191,7 +191,7 @@ public slots: signals: /** - * Emitted when an item was selected, tqcontains the text of + * Emitted when an item was selected, contains the text of * the selected item. */ void activated( const TQString& ); @@ -205,7 +205,7 @@ signals: protected: /** * This calculates the size of the dropdown and the relative position of the top - * left corner with respect to the parent widget. This matches the tqgeometry and position + * left corner with respect to the parent widget. This matches the geometry and position * normally used by K/TQComboBox when used with one. */ TQRect calculateGeometry() const; diff --git a/kdeui/kconfigdialog.cpp b/kdeui/kconfigdialog.cpp index dba91712f..3d5bfd697 100644 --- a/kdeui/kconfigdialog.cpp +++ b/kdeui/kconfigdialog.cpp @@ -160,7 +160,7 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) KConfigDialog* KConfigDialog::exists(const char* name) { - return openDialogs.tqfind(name); + return openDialogs.find(name); } bool KConfigDialog::showDialog(const char* name) diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index f0df154d5..02f8723f5 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -49,7 +49,7 @@ TQCursor KCursor::handCursor() KConfig *config = KGlobal::config(); KConfigGroupSaver saver( config, "General" ); -#ifndef Q_WS_WIN // this tqmask doesn't work too well on win32 +#ifndef Q_WS_WIN // this mask doesn't work too well on win32 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" ) { static const unsigned char HAND_BITS[] = { @@ -67,8 +67,8 @@ TQCursor KCursor::handCursor() 0x07, 0xf8, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xe0, 0xff, 0x03, 0xc0, 0xff, 0x03, 0xc0, 0xff, 0x01, 0xc0, 0xff, 0x01}; TQBitmap hand_bitmap(22, 22, HAND_BITS, true); - TQBitmap hand_tqmask(22, 22, HAND_MASK_BITS, true); - hand_cursor = new TQCursor(hand_bitmap, hand_tqmask, 7, 0); + TQBitmap hand_mask(22, 22, HAND_MASK_BITS, true); + hand_cursor = new TQCursor(hand_bitmap, hand_mask, 7, 0); // Hack to force TQCursor to call XCreatePixmapCursor() immediately // so the bitmaps don't get pushed out of the Xcursor LRU cache. hand_cursor->handle(); @@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor() TQWidget* w = actualWidget(); - if ( w->cursor().tqshape() != Qt::BlankCursor ) // someone messed with the cursor already + if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already return; if ( m_isOwnCursor ) @@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate() hideCursorDelay = 5000; // 5s default value KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") ); + KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( - TQString::tqfromLatin1("Autohiding cursor enabled"), true ); + TQString::fromLatin1("Autohiding cursor enabled"), true ); } KCursorPrivate::~KCursorPrivate() @@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve if ( enable ) { - if ( m_eventFilters.tqfind( w ) != NULL ) + if ( m_eventFilters.find( w ) != NULL ) return; KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w ); m_eventFilters.insert( w, filter ); @@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e ) if ( !enabled ) return false; - KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o ); + KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o ); Q_ASSERT( filter != NULL ); if ( filter == NULL ) diff --git a/kdeui/kcursor.h b/kdeui/kcursor.h index 84c38c318..ddef7a1cf 100644 --- a/kdeui/kcursor.h +++ b/kdeui/kcursor.h @@ -33,7 +33,7 @@ class TQWidget; * * A wrapper around TQCursor that allows for "themed" cursors. * - * Currently, the only themed cursor is a hand tqshaped cursor. + * Currently, the only themed cursor is a hand shaped cursor. * * A typical usage would be * \code diff --git a/kdeui/kcursor_private.h b/kdeui/kcursor_private.h index 0ed1789e6..839350c8c 100644 --- a/kdeui/kcursor_private.h +++ b/kdeui/kcursor_private.h @@ -36,7 +36,7 @@ class TQWidget; * @author John Firebaugh * @author Carsten Pfeiffer */ -class KCursorPrivateAutoHideEventFilter : public TQObject +class KCursorPrivateAutoHideEventFilter : public QObject { Q_OBJECT @@ -68,7 +68,7 @@ private: * @author Carsten Pfeiffer * @author John Firebaugh */ -class KCursorPrivate : public TQObject +class KCursorPrivate : public QObject { friend class KCursor; // to shut up the compiler Q_OBJECT diff --git a/kdeui/kdatepicker.cpp b/kdeui/kdatepicker.cpp index 3fa6fd5da..af9dede01 100644 --- a/kdeui/kdatepicker.cpp +++ b/kdeui/kdatepicker.cpp @@ -111,7 +111,7 @@ KDatePicker::KDatePicker(TQWidget *parent, TQDate dt, const char *name, WFlags f KDatePicker::KDatePicker( TQWidget *parent, const char *name ) : TQFrame(parent,name) { - init( TQDate::tqcurrentDate() ); + init( TQDate::currentDate() ); } void KDatePicker::init( const TQDate &dt ) @@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt ) line->installEventFilter( this ); if ( TQApplication::reverseLayout() ) { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); + yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); + monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); } else { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); + monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -390,7 +390,7 @@ KDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); @@ -463,13 +463,13 @@ KDatePicker::lineEnterPressed() void KDatePicker::todayButtonClicked() { - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); } QSize -KDatePicker::tqsizeHint() const +KDatePicker::sizeHint() const { - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } void @@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kdeui/kdatepicker.h b/kdeui/kdatepicker.h index a11b0f720..6a4e93537 100644 --- a/kdeui/kdatepicker.h +++ b/kdeui/kdatepicker.h @@ -60,7 +60,7 @@ public: * initially. **/ KDatePicker(TQWidget *parent=0, - QDate=TQDate::tqcurrentDate(), + QDate=TQDate::currentDate(), const char *name=0); /** The usual constructor. The given date will be displayed @@ -90,7 +90,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Sets the date. @@ -136,7 +136,7 @@ public: /** * By calling this method with @p enable = true, KDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the KDatePicker's tqtopLevelWidget()'s close() + * close-button will cause the KDatePicker's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see hasCloseButton diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp index 17f9bdfb8..bbf673a15 100644 --- a/kdeui/kdatetbl.cpp +++ b/kdeui/kdatetbl.cpp @@ -122,7 +122,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags if(!date_.isValid()) { kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl; - date_=TQDate::tqcurrentDate(); + date_=TQDate::currentDate(); } setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline @@ -146,7 +146,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); viewport()->setEraseColor(KGlobalSettings::baseColor()); - setDate(TQDate::tqcurrentDate()); // this initializes firstday, numdays, numDaysPrevMonth + setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); } @@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) ( daynum == 6 && calendar->calendarName() == "gregorian" ) ) normalday=false; - TQBrush brushInvertTitle(tqcolorGroup().base()); + TQBrush brushInvertTitle(colorGroup().base()); TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); if (!normalday) @@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->drawText(0, 0, w, h-1, AlignCenter, calendar->weekDayName(daynum, true), -1, &rect); - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: @@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // ° painting a day of the previous month or // ° painting a day of the following month // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text. - painter->setPen( tqcolorGroup().mid() ); + painter->setPen( colorGroup().mid() ); // painter->setPen(gray); } else { // paint a day of the current month if ( d->useCustomColors ) @@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->setPen( mode->fgColor ); } else - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } pen=painter->pen(); @@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // draw the currently selected date if (isEnabled()) { - painter->setPen(tqcolorGroup().highlight()); - painter->setBrush(tqcolorGroup().highlight()); + painter->setPen(colorGroup().highlight()); + painter->setBrush(colorGroup().highlight()); } else { - painter->setPen(tqcolorGroup().text()); - painter->setBrush(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); + painter->setBrush(colorGroup().text()); } - pen=tqcolorGroup().highlightedText(); + pen=colorGroup().highlightedText(); } else { painter->setBrush(paletteBackgroundColor()); painter->setPen(paletteBackgroundColor()); -// painter->setBrush(tqcolorGroup().base()); -// painter->setPen(tqcolorGroup().base()); +// painter->setBrush(colorGroup().base()); +// painter->setPen(colorGroup().base()); } - if ( pCellDate == TQDate::tqcurrentDate() ) + if ( pCellDate == TQDate::currentDate() ) { - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } if ( paintRect ) painter->drawRect(0, 0, w, h); @@ -392,7 +392,7 @@ KDateTable::keyPressEvent( TQKeyEvent *e ) setDate(date.addDays(1)); break; case Key_N: - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); break; case Key_Return: case Key_Enter: @@ -428,7 +428,7 @@ KDateTable::setFontSize(int size) TQRect rect; // ----- store rectangles: fontsize=size; - // ----- tqfind largest day name: + // ----- find largest day name: maxCell.setWidth(0); maxCell.setHeight(0); for(count=0; count<7; ++count) @@ -439,7 +439,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(QMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); } @@ -536,7 +536,7 @@ KDateTable::setDate(const TQDate& date_) numDaysPrevMonth=calendar->daysInMonth(temp); if(changed) { - tqrepaintContents(false); + repaintContents(false); } return true; } @@ -547,28 +547,28 @@ KDateTable::getDate() const return date; } -// what are those tqrepaintContents() good for? (pfeiffer) +// what are those repaintContents() good for? (pfeiffer) void KDateTable::focusInEvent( TQFocusEvent *e ) { -// tqrepaintContents(false); +// repaintContents(false); TQGridView::focusInEvent( e ); } void KDateTable::focusOutEvent( TQFocusEvent *e ) { -// tqrepaintContents(false); +// repaintContents(false); TQGridView::focusOutEvent( e ); } QSize -KDateTable::tqsizeHint() const +KDateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl; + kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -596,7 +596,7 @@ void KDateTable::setCustomDatePainting(const TQDate &date, const TQColor &fgColo mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.tqreplace( date.toString(), mode ); + d->customPaintingModes.replace( date.toString(), mode ); d->useCustomColors=true; update(); } @@ -660,7 +660,7 @@ KDateInternalWeekSelector::setMaxWeek(int max) } // ### CFM To avoid binary incompatibility. -// In future releases, remove this and tqreplace by a QDate +// In future releases, remove this and replace by a QDate // private member, needed in KDateInternalMonthPicker::paintCell class KDateInternalMonthPicker::KDateInternalMonthPrivate { public: @@ -695,10 +695,10 @@ KDateInternalMonthPicker::KDateInternalMonthPicker d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day()); // For monthsInYear != 12 setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); - // enable to tqfind drawing failures: + // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker - // ----- tqfind the preferred size + // ----- find the preferred size // (this is slow, possibly, but unfortunately it is needed here): TQFontMetrics metrics(font); for(int i = 1; ; ++i) @@ -713,7 +713,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker } QSize -KDateInternalMonthPicker::tqsizeHint() const +KDateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -743,7 +743,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) { int index; TQString text; - // ----- tqfind the number of the cell: + // ----- find the number of the cell: index=3*row+col+1; text=KGlobal::locale()->calendar()->monthName(index, KGlobal::locale()->calendar()->year(TQDate(d->year, d->month, @@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // tqrepaint the former active cell + if ( tmpRow > -1 ) // repaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -935,7 +935,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e) { result=0; // rejected d->exec = false; - tqApp->exit_loop(); + qApp->exit_loop(); } } @@ -944,7 +944,7 @@ KPopupFrame::close(int r) { result=r; d->exec = false; - tqApp->exit_loop(); + qApp->exit_loop(); } void @@ -954,7 +954,7 @@ KPopupFrame::hide() if (d->exec) { d->exec = false; - tqApp->exit_loop(); + qApp->exit_loop(); } } @@ -1006,10 +1006,10 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); + repaint(); d->exec = true; const TQGuardedPtr that = this; - tqApp->enter_loop(); + qApp->enter_loop(); if ( !that ) return TQDialog::Rejected; hide(); diff --git a/kdeui/kdatetbl.h b/kdeui/kdatetbl.h index 7cf76dc1c..8827c0a00 100644 --- a/kdeui/kdatetbl.h +++ b/kdeui/kdatetbl.h @@ -98,7 +98,7 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -270,7 +270,7 @@ public: /** * The constructor. */ - KDateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), + KDateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(), const char* name=0, WFlags f=0); /** @@ -289,9 +289,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ diff --git a/kdeui/kdatetimewidget.cpp b/kdeui/kdatetimewidget.cpp index 22dbbd6d9..76d92edd2 100644 --- a/kdeui/kdatetimewidget.cpp +++ b/kdeui/kdatetimewidget.cpp @@ -38,8 +38,8 @@ void KDateTimeWidget::init() { d = new KDateTimeWidgetPrivate; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->dateWidget = new KDateWidget(this); d->timeWidget = new KTimeWidget(this); diff --git a/kdeui/kdatewidget.cpp b/kdeui/kdatewidget.cpp index e4228d81b..ad6683e7f 100644 --- a/kdeui/kdatewidget.cpp +++ b/kdeui/kdatewidget.cpp @@ -37,7 +37,7 @@ public: KDateWidgetSpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); } }; @@ -73,8 +73,8 @@ void KDateWidget::init() { d = new KDateWidgetPrivate; KLocale *locale = KGlobal::locale(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) @@ -97,8 +97,8 @@ void KDateWidget::init(const TQDate& date) { d = new KDateWidgetPrivate; KLocale *locale = KGlobal::locale(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) diff --git a/kdeui/kdcopactionproxy.cpp b/kdeui/kdcopactionproxy.cpp index 2b20e8bd3..15e431da3 100644 --- a/kdeui/kdcopactionproxy.cpp +++ b/kdeui/kdcopactionproxy.cpp @@ -132,7 +132,7 @@ bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, c { replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (TQ_INT8)action->isPlugged(); + reply << (Q_INT8)action->isPlugged(); return true; } diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h index 327f64f18..f1d7ac284 100644 --- a/kdeui/kdepackages.h +++ b/kdeui/kdepackages.h @@ -259,7 +259,7 @@ const char * const packages[] = { "kamefu", "kanagram", "kandy", -"kapptqfinder", +"kappfinder", "kapptemplate", "karbon", "karbon/opendocument", @@ -520,7 +520,7 @@ const char * const packages[] = { "kdevelop/php support", "kdevelop/problem reporter", "kdevelop/qeditor", -"kdevelop/tqreplace part", +"kdevelop/replace part", "kdevelop/scriptproject", "kdevelop/valgrind integration", "kdevplatform", @@ -586,8 +586,8 @@ const char * const packages[] = { "kfile-plugins/wav", "kfile", "kfile/kfileplacesview", -"kfiletqreplace", -"ktqfind", +"kfilereplace", +"kfind", "kfinger", "kfloppy", "kformula", @@ -703,7 +703,7 @@ const char * const packages[] = { "kipiplugins/batchprocessimages", "kipiplugins/calendar", "kipiplugins/cdarchiving", -"kipiplugins/tqfindimages", +"kipiplugins/findimages", "kipiplugins/flickrexport", "kipiplugins/galleryexport", "kipiplugins/imageviewer", @@ -921,12 +921,12 @@ const char * const packages[] = { "kopete/Alias Plugin", "kopete/Audio/Video Plugin", "kopete/Auto-Away Plugin", -"kopete/Autotqreplace plugin", +"kopete/Autoreplace plugin", "kopete/Bonjour Plugin", "kopete/Bookmarks plugin", "kopete/Chat Window", "kopete/Chatwindow Styles", -"kopete/Connection tqStatus Plugin", +"kopete/Connection Status Plugin", "kopete/Contact Notes Plugin", "kopete/Contact list", "kopete/Cryptography Plugin", @@ -1276,7 +1276,7 @@ const char * const packages[] = { "systemsettings/kcmlaunch", "systemsettings/kdm", "systemsettings/keyboard", -"systemsettings/keyboard_tqlayout", +"systemsettings/keyboard_layout", "systemsettings/keys", "systemsettings/khotkeys", "systemsettings/ksplashthememgr", diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp index bf2298fd3..e49f3a148 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp @@ -57,11 +57,11 @@ void KDETrayProxy::windowAdded( WId w ) if ( !trayWinFor ) // not a KDE tray window return; // kdDebug() << "New tray window:" << w << endl; - if( !tray_windows.tqcontains( w )) + if( !tray_windows.contains( w )) tray_windows.append( w ); withdrawWindow( w ); // window will be removed from pending_windows when after docked - if( !pending_windows.tqcontains( w )) + if( !pending_windows.contains( w )) pending_windows.append( w ); docked_windows.remove( w ); Window owner = selection.owner(); @@ -87,21 +87,21 @@ bool KDETrayProxy::x11Event( XEvent* e ) { if( tray_windows.isEmpty()) return false; - if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window )) + if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window )) { tray_windows.remove( e->xdestroywindow.window ); pending_windows.remove( e->xdestroywindow.window ); docked_windows.remove( e->xdestroywindow.window ); } - if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window )) + if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window )) { if( e->xreparent.parent == qt_xrootwin()) { - if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) + if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) { // kdDebug() << "Window released:" << e->xreparent.window << endl; docked_windows.remove( e->xreparent.window ); - if( !pending_windows.tqcontains( e->xreparent.window )) + if( !pending_windows.contains( e->xreparent.window )) pending_windows.append( e->xreparent.window ); } } @@ -111,9 +111,9 @@ bool KDETrayProxy::x11Event( XEvent* e ) pending_windows.remove( e->xreparent.window ); } } - if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window )) + if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window )) { - if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) + if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) { // kdDebug() << "Window unmapped:" << e->xunmap.window << endl; XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 ); diff --git a/kdeui/kdialog.cpp b/kdeui/kdialog.cpp index 054144351..5963a415d 100644 --- a/kdeui/kdialog.cpp +++ b/kdeui/kdialog.cpp @@ -132,9 +132,9 @@ void KDialog::setPlainCaption( const TQString &caption ) void KDialog::resizeLayout( TQWidget *w, int margin, int spacing ) { - if( w->tqlayout() ) + if( w->layout() ) { - resizeLayout( w->tqlayout(), margin, spacing ); + resizeLayout( w->layout(), margin, spacing ); } if( w->children() ) @@ -162,10 +162,10 @@ void KDialog::resizeLayout( TQLayoutItem *lay, int margin, int spacing ) resizeLayout( child, margin, spacing ); ++it; } - if( lay->tqlayout() ) + if( lay->layout() ) { - lay->tqlayout()->setMargin( margin ); - lay->tqlayout()->setSpacing( spacing ); + lay->layout()->setMargin( margin ); + lay->layout()->setSpacing( spacing ); } } @@ -188,7 +188,7 @@ static TQRect screenRect( TQWidget *w, int screen ) } return desktop->availableGeometry(screen); } else { - return desktop->tqgeometry(); + return desktop->geometry(); } } diff --git a/kdeui/kdialog.h b/kdeui/kdialog.h index 17a1926b7..d74b232ce 100644 --- a/kdeui/kdialog.h +++ b/kdeui/kdialog.h @@ -37,7 +37,7 @@ class TQLayoutItem; * (@p escape = @p reject(), @p enter = @p accept(), etc.) are disabled. * * The marginHint() and spacingHint() sizes shall be used - * whenever you tqlayout the interior of a dialog. One special note. If + * whenever you layout the interior of a dialog. One special note. If * you make your own action buttons (OK, Cancel etc), the space * beteween the buttons shall be spacingHint(), whereas the space * above, below, to the right and to the left shall be marginHint(). @@ -75,20 +75,20 @@ class KDEUI_EXPORT KDialog : public QDialog static int spacingHint(); /** - * Resize every tqlayout manager used in @p widget and its nested children. + * Resize every layout manager used in @p widget and its nested children. * * @param widget The widget used. - * @param margin The new tqlayout margin. - * @param spacing The new tqlayout spacing. + * @param margin The new layout margin. + * @param spacing The new layout spacing. */ static void resizeLayout( TQWidget *widget, int margin, int spacing ); /** - * Resize every tqlayout associated with @p lay and its children. + * Resize every layout associated with @p lay and its children. * - * @param lay tqlayout to be resized - * @param margin The new tqlayout margin - * @param spacing The new tqlayout spacing + * @param lay layout to be resized + * @param margin The new layout margin + * @param spacing The new layout spacing */ static void resizeLayout( TQLayoutItem *lay, int margin, int spacing ); @@ -97,7 +97,7 @@ class KDEUI_EXPORT KDialog : public QDialog * account. If @p screen is -1, @p widget will be centered on its * current screen (if it was shown already) or on the primary screen. * If @p screen is -3, @p widget will be centered on the screen that - * currently tqcontains the mouse pointer. + * currently contains the mouse pointer. * @p screen will be ignored if a merged display (like Xinerama) is not * in use, or merged display placement is not enabled in kdeglobals. * @since 3.1 @@ -106,7 +106,7 @@ class KDEUI_EXPORT KDialog : public QDialog /** * Places @p widget so that it doesn't cover a certain @p area of the screen. - * This is typically used by the "tqfind dialog" so that the match it tqfinds can + * This is typically used by the "find dialog" so that the match it finds can * be read. * For @p screen, see centerOnScreen * @return true on success (widget doesn't cover area anymore, or never did), @@ -155,7 +155,7 @@ class KDEUI_EXPORT KDialog : public QDialog * Use marginHint() and spacingHint() in your slot * to get the new values. */ - void tqlayoutHintChanged(); + void layoutHintChanged(); private: static const int mMarginSize; @@ -185,7 +185,7 @@ class KDEUI_EXPORT KDialog : public QDialog * @author Waldo Bastian */ class KDialogQueuePrivate; -class KDEUI_EXPORT KDialogQueue : public TQObject +class KDEUI_EXPORT KDialogQueue : public QObject { Q_OBJECT diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp index 884e6a84d..202de5f9b 100644 --- a/kdeui/kdialogbase.cpp +++ b/kdeui/kdialogbase.cpp @@ -65,7 +65,7 @@ struct SButton : public Qt SButton() { box = 0; - tqmask = 0; + mask = 0; style = 0; } @@ -76,7 +76,7 @@ struct SButton : public Qt KPushButton *button( int key ); TQWidget *box; - int tqmask; + int mask; int style; TQPtrList list; }; @@ -109,7 +109,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); makeButtonBox( buttonMask, defaultButton, user1, user2, user3 ); @@ -131,7 +131,7 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), @@ -160,7 +160,7 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), @@ -189,7 +189,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(tqlayoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); @@ -230,7 +230,7 @@ void SButton::resize( bool sameWidth, int margin, for( p = list.first(); p; p = list.next() ) { - const TQSize s( p->tqsizeHint() ); + const TQSize s( p->sizeHint() ); if( s.height() > h ) { h = s.height(); } if( s.width() > w ) { w = s.width(); } } @@ -239,7 +239,7 @@ void SButton::resize( bool sameWidth, int margin, { for( p = list.first(); p; p = list.next() ) { - TQSize s( p->tqsizeHint() ); + TQSize s( p->sizeHint() ); if( sameWidth ) { s.setWidth( w ); } p->setFixedWidth( s.width() ); t += s.width() + spacing; @@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin, // sameWidth has no effect here for( p = list.first(); p; p = list.next() ) { - TQSize s( p->tqsizeHint() ); + TQSize s( p->sizeHint() ); s.setWidth( w ); p->setFixedSize( s ); t += s.height() + spacing; @@ -381,7 +381,7 @@ void KDialogBase::makeRelay() if( mTile ) { connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( qApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); } } @@ -426,20 +426,20 @@ TQFrame *KDialogBase::plainPage() void KDialogBase::adjustSize() { -// if (tqlayout()) -// tqlayout()->activate(); +// if (layout()) +// layout()->activate(); if( d->bFixed ) - setFixedSize( tqsizeHint() ); + setFixedSize( sizeHint() ); else - resize( tqsizeHint() ); + resize( sizeHint() ); } -TQSize KDialogBase::tqsizeHint() const +TQSize KDialogBase::sizeHint() const { - return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize; + return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize; } -TQSize KDialogBase::tqminimumSizeHint() const +TQSize KDialogBase::minimumSizeHint() const { const int m = marginHint(); const int s = spacingHint(); @@ -454,7 +454,7 @@ TQSize KDialogBase::tqminimumSizeHint() const // if( mUrlHelp ) { - s2 = mUrlHelp->tqminimumSize() + zeroByS; + s2 = mUrlHelp->minimumSize() + zeroByS; } s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -464,13 +464,13 @@ TQSize KDialogBase::tqminimumSizeHint() const // if( mJanus ) { - s2 = mJanus->tqminimumSizeHint() + zeroByS; + s2 = mJanus->minimumSizeHint() + zeroByS; } else if( mMainWidget ) { - s2 = mMainWidget->tqsizeHint() + zeroByS; - s2 = s2.expandedTo( mMainWidget->tqminimumSize() ); - s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() ); + s2 = mMainWidget->sizeHint() + zeroByS; + s2 = s2.expandedTo( mMainWidget->minimumSize() ); + s2 = s2.expandedTo( mMainWidget->minimumSizeHint() ); if( s2.isEmpty() ) { s2 = TQSize( 100, 100+s ); @@ -485,9 +485,9 @@ TQSize KDialogBase::tqminimumSizeHint() const if (d->detailsWidget && d->bDetails) { - s2 = d->detailsWidget->tqsizeHint() + zeroByS; - s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() ); - s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() ); + s2 = d->detailsWidget->sizeHint() + zeroByS; + s2 = s2.expandedTo( d->detailsWidget->minimumSize() ); + s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() ); s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); } @@ -497,7 +497,7 @@ TQSize KDialogBase::tqminimumSizeHint() const // if( mActionSep ) { - s1.rheight() += mActionSep->tqminimumSize().height() + s; + s1.rheight() += mActionSep->minimumSize().height() + s; } // @@ -505,7 +505,7 @@ TQSize KDialogBase::tqminimumSizeHint() const // if( d->mButton.box ) { - s2 = d->mButton.box->tqminimumSize(); + s2 = d->mButton.box->minimumSize(); if( mButtonOrientation == Horizontal ) { s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); @@ -530,7 +530,7 @@ TQSize KDialogBase::tqminimumSizeHint() const void KDialogBase::disableResize() { - setFixedSize( tqsizeHint() ); + setFixedSize( sizeHint() ); } @@ -571,31 +571,31 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, d->mButton.box = new TQWidget( this ); - d->mButton.tqmask = buttonMask; - if( d->mButton.tqmask & Help ) + d->mButton.mask = buttonMask; + if( d->mButton.mask & Help ) { KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); } - if( d->mButton.tqmask & Default ) + if( d->mButton.mask & Default ) { KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) ); } - if( d->mButton.tqmask & Details ) + if( d->mButton.mask & Details ) { KPushButton *pb = d->mButton.append( Details, TQString::null ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); setDetails(false); } - if( d->mButton.tqmask & User3 ) + if( d->mButton.mask & User3 ) { KPushButton *pb = d->mButton.append( User3, user3 ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) ); } - if( d->mButton.tqmask & User2 ) + if( d->mButton.mask & User2 ) { KPushButton *pb = d->mButton.append( User2, user2 ); if( mMessageBoxMode ) @@ -607,7 +607,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) ); } } - if( d->mButton.tqmask & User1 ) + if( d->mButton.mask & User1 ) { KPushButton *pb = d->mButton.append( User1, user1 ); if( mMessageBoxMode ) @@ -619,29 +619,29 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) ); } } - if( d->mButton.tqmask & Ok ) + if( d->mButton.mask & Ok ) { KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) ); } - if( d->mButton.tqmask & Apply ) + if( d->mButton.mask & Apply ) { KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) ); } - if( d->mButton.tqmask & Try ) + if( d->mButton.mask & Try ) { KPushButton *pb = d->mButton.append( Try, i18n( "&Try" ) ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) ); } - if( d->mButton.tqmask & Cancel ) + if( d->mButton.mask & Cancel ) { KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) ); } - if( d->mButton.tqmask & Close ) + if( d->mButton.mask & Close ) { KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) ); @@ -671,11 +671,11 @@ void KDialogBase::setButtonStyle( int style ) if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; } d->mButton.style = style; - const int *tqlayout; - int tqlayoutMax = 0; + const int *layout; + int layoutMax = 0; if (mMessageBoxMode) { - static const int tqlayoutRule[5][6] = + static const int layoutRule[5][6] = { {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler}, {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler}, @@ -683,12 +683,12 @@ void KDialogBase::setButtonStyle( int style ) {Details|Filler,Stretch,Cancel|Stretch,User2|Stretch,User1|Stretch,Details}, {Details|Filler,Stretch,Cancel|Stretch,User2|Stretch,User1|Stretch,Details} }; - tqlayoutMax = 6; - tqlayout = tqlayoutRule[ d->mButton.style ]; + layoutMax = 6; + layout = layoutRule[ d->mButton.style ]; } else if (mButtonOrientation == Horizontal) { - static const int tqlayoutRule[5][10] = + static const int layoutRule[5][10] = { {Details,Help,Default,Stretch,User3,User2,User1,Ok,Apply|Try,Cancel|Close}, {Details,Help,Default,Stretch,User3,User2,User1,Cancel|Close,Apply|Try,Ok}, @@ -696,12 +696,12 @@ void KDialogBase::setButtonStyle( int style ) {Ok,Apply|Try,Cancel|Close,User3,User2,User1,Stretch,Default,Help,Details}, {Ok,Cancel|Close,Apply|Try,User3,User2,User1,Stretch,Default,Help,Details} }; - tqlayoutMax = 10; - tqlayout = tqlayoutRule[ d->mButton.style ]; + layoutMax = 10; + layout = layoutRule[ d->mButton.style ]; } else { - static const int tqlayoutRule[5][10] = + static const int layoutRule[5][10] = { {Ok,Apply|Try,User1,User2,User3,Stretch,Default,Cancel|Close,Help, Details}, //{Ok,Apply|Try,Cancel|Close,User1,User2,User3,Stretch, Default,Help, Details}, @@ -710,13 +710,13 @@ void KDialogBase::setButtonStyle( int style ) {Ok,Apply|Try,Cancel|Close,User3,User2,User1,Stretch,Default,Help,Details}, {Ok,Cancel|Close,Apply|Try,User3,User2,User1,Stretch,Default,Help,Details} }; - tqlayoutMax = 10; - tqlayout = tqlayoutRule[ d->mButton.style ]; + layoutMax = 10; + layout = layoutRule[ d->mButton.style ]; } - if( d->mButton.box->tqlayout() ) + if( d->mButton.box->layout() ) { - delete d->mButton.box->tqlayout(); + delete d->mButton.box->layout(); } TQBoxLayout *lay; @@ -735,74 +735,74 @@ void KDialogBase::setButtonStyle( int style ) TQPushButton *prevButton = 0; TQPushButton *newButton; - for( int i=0; iaddStretch(1); continue; } - else if (tqlayout[i] & Filler) // Conditional space + else if (layout[i] & Filler) // Conditional space { - if (d->mButton.tqmask & tqlayout[i]) + if (d->mButton.mask & layout[i]) { - newButton = actionButton( (ButtonCode) (tqlayout[i] & ~(Stretch | Filler))); + newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler))); if (newButton) - lay->addSpacing(newButton->tqsizeHint().width()); + lay->addSpacing(newButton->sizeHint().width()); } continue; } - else if( d->mButton.tqmask & Help & tqlayout[i] ) + else if( d->mButton.mask & Help & layout[i] ) { newButton = actionButton( Help ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Default & tqlayout[i] ) + else if( d->mButton.mask & Default & layout[i] ) { newButton = actionButton( Default ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & User3 & tqlayout[i] ) + else if( d->mButton.mask & User3 & layout[i] ) { newButton = actionButton( User3 ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & User2 & tqlayout[i] ) + else if( d->mButton.mask & User2 & layout[i] ) { newButton = actionButton( User2 ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & User1 & tqlayout[i] ) + else if( d->mButton.mask & User1 & layout[i] ) { newButton = actionButton( User1 ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Ok & tqlayout[i] ) + else if( d->mButton.mask & Ok & layout[i] ) { newButton = actionButton( Ok ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Apply & tqlayout[i] ) + else if( d->mButton.mask & Apply & layout[i] ) { newButton = actionButton( Apply ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Try & tqlayout[i] ) + else if( d->mButton.mask & Try & layout[i] ) { newButton = actionButton( Try ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Cancel & tqlayout[i] ) + else if( d->mButton.mask & Cancel & layout[i] ) { newButton = actionButton( Cancel ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Close & tqlayout[i] ) + else if( d->mButton.mask & Close & layout[i] ) { newButton = actionButton( Close ); lay->addWidget( newButton ); ++numButton; } - else if( d->mButton.tqmask & Details & tqlayout[i] ) + else if( d->mButton.mask & Details & layout[i] ) { newButton = actionButton( Details ); lay->addWidget( newButton ); ++numButton; @@ -813,7 +813,7 @@ void KDialogBase::setButtonStyle( int style ) } // Add conditional stretch (Only added if a button was added) - if(tqlayout[i] & Stretch) + if(layout[i] & Stretch) { lay->addStretch(1); } @@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget) { delete d->detailsWidget; d->detailsWidget = detailsWidget; - if (d->detailsWidget->tqparentWidget() != this) + if (d->detailsWidget->parentWidget() != this) d->detailsWidget->reparent(this, TQPoint(0,0)); d->detailsWidget->hide(); if( mIsActivated ) @@ -1136,14 +1136,14 @@ void KDialogBase::setDetails(bool showDetails) setButtonText(Details, d->detailsButton+ " <<"); if (d->detailsWidget) { - if (tqlayout()) - tqlayout()->setEnabled(false); + if (layout()) + layout()->setEnabled(false); adjustSize(); d->detailsWidget->show(); - if (tqlayout()) + if (layout()) { - tqlayout()->activate(); - tqlayout()->setEnabled(true); + layout()->activate(); + layout()->setEnabled(true); } } } @@ -1154,8 +1154,8 @@ void KDialogBase::setDetails(bool showDetails) { d->detailsWidget->hide(); } - if (tqlayout()) - tqlayout()->activate(); + if (layout()) + layout()->activate(); adjustSize(); } d->bSettingDetails = false; @@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const r.setLeft( marginHint() ); r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) ); r.setRight( width() - marginHint() ); - int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint()); + int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint()); if( d->mButton.box ) { - r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h ); + r.setBottom( height() - d->mButton.box->minimumSize().height() - h ); } else { @@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const uly = marginHint(); if( mUrlHelp ) { - uly += mUrlHelp->tqminimumSize().height(); + uly += mUrlHelp->minimumSize().height(); } lrx = marginHint(); - lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0; + lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0; if( mActionSep ) { - lry += mActionSep->tqminimumSize().height() + marginHint(); + lry += mActionSep->minimumSize().height() + marginHint(); } } @@ -1748,15 +1748,15 @@ TQSize KDialogBase::configDialogSize( KConfig& config, const TQString& groupName ) const { int w, h; - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - w = tqsizeHint().width(); - h = tqsizeHint().height(); + w = sizeHint().width(); + h = sizeHint().height(); KConfigGroupSaver cs(&config, groupName); - w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w ); - h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h ); + w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); + h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); return TQSize( w, h ); } @@ -1771,15 +1771,15 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, bool global ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(&config, groupName); TQSize sizeToSave = size(); - config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), + config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), TQString::number( sizeToSave.width()), true, global); - config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), + config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()), TQString::number( sizeToSave.height()), true, global); } diff --git a/kdeui/kdialogbase.h b/kdeui/kdialogbase.h index 5a914b791..ea4b21955 100644 --- a/kdeui/kdialogbase.h +++ b/kdeui/kdialogbase.h @@ -48,18 +48,18 @@ class KDialogBaseButton; class KDialogBaseTile; /** - * @short A dialog base class with standard buttons and predefined tqlayouts. + * @short A dialog base class with standard buttons and predefined layouts. * * Provides basic functionality needed by nearly all dialogs. * - * It offers the standard action buttons you'd expect to tqfind in a + * It offers the standard action buttons you'd expect to find in a * dialog as well as the capability to define at most three configurable - * buttons. You can define a main widget that tqcontains your specific - * dialog tqlayout or you can use a predefined tqlayout. Currently, @p + * buttons. You can define a main widget that contains your specific + * dialog layout or you can use a predefined layout. Currently, @p * TreeList/Paged, @p Tabbed, @p Plain, @p Swallow and @p IconList - * mode tqlayouts (faces) are available. + * mode layouts (faces) are available. * - * The class takes care of the tqgeometry management. You only need to define + * The class takes care of the geometry management. You only need to define * a minimum size for the widget you want to use as the main widget. * * You can set a background tile (pixmap) for parts of the dialog. The @@ -67,7 +67,7 @@ class KDialogBaseTile; * application so that they all get the same look and feel. * * There is a tutorial available on http://developer.kde.org/ (NOT YET) - * that tqcontains + * that contains * copy/paste examples as well a screenshots on how to use this class. * * Standard buttons (action buttons):\n @@ -100,7 +100,7 @@ class KDialogBaseTile; * signals that are related to the standard action buttons will be used * when you don't use these buttons. * - * Dialog tqshapes:\n + * Dialog shapes:\n * * You can either use one of the prebuilt, easy to use, faces or * define your own main widget. The dialog provides ready to use @@ -138,7 +138,7 @@ class KDialogBaseTile; * equal to KDialog::marginHint(). You should not add a margin yourself, * since one will be added automatically. * The example below (from kedit) shows how you use the top level widget - * and its tqlayout. The second argument (the border) to QVBoxLayout + * and its layout. The second argument (the border) to QVBoxLayout * is 0. This situation is valid for addPage , addVBoxPage , * addHBoxPage , addGridPage , makeMainWidget , * makeVBoxMainWidget , makeHBoxMainWidget and @@ -279,8 +279,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * In KDE4 a WFlag paramater should be added after modal and next * function can be removed. * - * Constructor for the predefined tqlayout mode where you specify the - * kind of tqlayout (face). + * Constructor for the predefined layout mode where you specify the + * kind of layout (face). * * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or * IconList. @@ -312,8 +312,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** - * Constructor for the predefined tqlayout mode where you specify the - * kind of tqlayout (face). + * Constructor for the predefined layout mode where you specify the + * kind of layout (face). * * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or * IconList. @@ -426,18 +426,18 @@ class KDEUI_EXPORT KDialogBase : public KDialog * resized before showing it. **/ virtual void adjustSize(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /** - * Retrieve the empty page when the predefined tqlayout is used in @p Plain + * Retrieve the empty page when the predefined layout is used in @p Plain * mode. * * This widget must be used as the toplevel widget of your dialog * code. * - * @return The widget or 0 if the predefined tqlayout mode is not @p Plain - * or if you don't use any predefined tqlayout. + * @return The widget or 0 if the predefined layout mode is not @p Plain + * or if you don't use any predefined layout. */ TQFrame *plainPage(); @@ -448,8 +448,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * The returned widget must be used as the * toplevel widget for this particular page. * Note: The returned frame widget has no - * tqlayout manager associated with it. In order to use it you must - * create a tqlayout yourself as the example below illustrates: + * layout manager associated with it. In order to use it you must + * create a layout yourself as the example below illustrates: * * \code * TQFrame *page = addPage( i18n("Layout") ); @@ -492,8 +492,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * @p IconList or @p Tabbed mode. * * The returned widget must be used as the toplevel widget for - * this particular page. The widget tqcontains a QVBoxLayout - * tqlayout so the widget children are lined up vertically. You can + * this particular page. The widget contains a QVBoxLayout + * layout so the widget children are lined up vertically. You can * use it as follows: * * \code @@ -535,8 +535,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * @p IconList or @p Tabbed mode. * * The returned widget must be used as the - * toplevel widget for this particular page. The widget tqcontains a - * TQHBoxLayout tqlayout so the widget children are lined up horizontally. + * toplevel widget for this particular page. The widget contains a + * TQHBoxLayout layout so the widget children are lined up horizontally. * You can use it as follows: * * @param itemName String used in the list or as tab item name. @@ -572,8 +572,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * @p IconList or @p Tabbed mode. * * The returned widget must be used as the - * toplevel widget for this particular page. The widget tqcontains a - * TQGridLayout tqlayout so the widget children are positioned in a grid. + * toplevel widget for this particular page. The widget contains a + * TQGridLayout layout so the widget children are positioned in a grid. * * @param n Specifies the number of columns if @p dir is Qt::Horizontal * or the number of rows if @p dir is Qt::Vertical. @@ -733,7 +733,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Sets the page with @p index to be displayed. * * This method will only - * work when the dialog is using the predefined tqshape of TreeList, + * work when the dialog is using the predefined shape of TreeList, * IconList or Tabbed. * * @param index Index of the page to be shown. @@ -745,7 +745,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Returns the index of the active page. * * This method will only work when the dialog is using the - * predefined tqshape of Tabbed, TreeList or IconList. + * predefined shape of Tabbed, TreeList or IconList. * * @return The page index or -1 if there is no active page. */ @@ -828,7 +828,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, tqsizeHint() is returned. + * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param groupName Name of the group to read from. The old group * of KGlobal::config is preserved. @@ -837,7 +837,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, tqsizeHint() is returned. + * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group @@ -888,7 +888,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * * If the default parameters are used * (that is, if no parameters are given) the standard texts are set: - * The button shows "OK", the tooltip tqcontains "Accept settings." + * The button shows "OK", the tooltip contains "Accept settings." * (internationalized) and the quickhelp text explains the standard * behavior of the OK button in settings dialogs. * @@ -918,7 +918,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * * If the default parameters are * used (that is, if no parameters are given) the standard texts are set: - * The button shows "Apply", the tooltip tqcontains "Apply settings." + * The button shows "Apply", the tooltip contains "Apply settings." * (internationalized) and the quickhelp text explains the standard * behavior of the apply button in settings dialogs. * @@ -1150,7 +1150,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * * This method returns the contents rectangle of the work area. Place * your widgets inside this rectangle, and use it to set up - * their tqgeometry. Be careful: The rectangle is only valid after + * their geometry. Be careful: The rectangle is only valid after * resizing the dialog, as it is a result of the resizing process. * If you need the "overhead" the dialog needs for its elements, * use getBorderWidths(). @@ -1167,7 +1167,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * set it as a minimum size for the resulting dialog. * * You should not need to use this method and never if you use one of - * the predefined tqshapes. + * the predefined shapes. * * @param w The width of you special widget. * @param h The height of you special widget. @@ -1311,74 +1311,74 @@ class KDEUI_EXPORT KDialogBase : public KDialog signals: /** * The Help button was pressed. This signal is only emitted if - * slotHelp() is not tqreplaced. + * slotHelp() is not replaced. */ void helpClicked(); /** * The Default button was pressed. This signal is only emitted if - * slotDefault() is not tqreplaced. + * slotDefault() is not replaced. */ void defaultClicked(); /** * The User3 button was pressed. This signal is only emitted if - * slotUser3() is not tqreplaced. + * slotUser3() is not replaced. */ void user3Clicked(); /** * The User2 button was pressed. This signal is only emitted if - * slotUser2() is not tqreplaced. + * slotUser2() is not replaced. */ void user2Clicked(); /** * The User1 button was pressed. This signal is only emitted if - * slotUser1() is not tqreplaced. + * slotUser1() is not replaced. */ void user1Clicked(); /** * The Apply button was pressed. This signal is only emitted if - * slotApply() is not tqreplaced. + * slotApply() is not replaced. */ void applyClicked(); /** * The Try button was pressed. This signal is only emitted if - * slotTry() is not tqreplaced. + * slotTry() is not replaced. */ void tryClicked(); /** * The OK button was pressed. This signal is only emitted if - * slotOk() is not tqreplaced. + * slotOk() is not replaced. */ void okClicked(); /** * The Yes button was pressed. This signal is only emitted if - * slotYes() is not tqreplaced. + * slotYes() is not replaced. */ void yesClicked(); /** * The No button was pressed. This signal is only emitted if - * slotNo() is not tqreplaced. + * slotNo() is not replaced. */ void noClicked(); /** * The Cancel button was pressed. This signal is only emitted if - * slotCancel() is not tqreplaced. + * slotCancel() is not replaced. */ void cancelClicked(); /** * The Close button was pressed. This signal is only emitted if - * slotClose() is not tqreplaced. + * slotClose() is not replaced. */ void closeClicked(); @@ -1549,7 +1549,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog private: /** - * Prepares the tqlayout that manages the widgets of the dialog + * Prepares the layout that manages the widgets of the dialog */ void setupLayout(); @@ -1572,7 +1572,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * @param user2 User button2 item. * @param user2 User button3 item. */ - void makeButtonBox( int tqmask, ButtonCode defaultButton, + void makeButtonBox( int mask, ButtonCode defaultButton, const KGuiItem &user1 = KGuiItem(), const KGuiItem &user2 = KGuiItem(), const KGuiItem &user3 = KGuiItem() ); diff --git a/kdeui/kdialogbase_priv.h b/kdeui/kdialogbase_priv.h index d38ef884a..a5bbf31be 100644 --- a/kdeui/kdialogbase_priv.h +++ b/kdeui/kdialogbase_priv.h @@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton * Used internally by KDialogBase. * @internal */ -class KDEUI_EXPORT KDialogBaseTile : public TQObject +class KDEUI_EXPORT KDialogBaseTile : public QObject { Q_OBJECT diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index b7d124f43..dc5213c3c 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -151,7 +151,7 @@ void KDockMainWindow::makeDockInvisible( KDockWidget* dock ) void KDockMainWindow::makeWidgetDockVisible( TQWidget* widget ) { - makeDockVisible( dockManager->tqfindWidgetParentDock(widget) ); + makeDockVisible( dockManager->findWidgetParentDock(widget) ); } void KDockMainWindow::writeDockConfig(TQDomElement &base) @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -221,8 +221,8 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #endif d = new KDockWidgetHeaderPrivate( this ); - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); drag = new KDockWidgetHeaderDrag( this, parent ); @@ -234,7 +234,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); - TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") ); + TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); @@ -258,15 +258,15 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) d->dummy->setFixedSize( 1,closeButton->pixmap()->height() ); - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( d->dummy); - tqlayout->addWidget( stayButton ); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( d->dummy); + layout->addWidget( stayButton ); + layout->addWidget( closeButton ); + layout->activate(); d->dummy->hide(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + drag->setFixedHeight( layout->minimumSize().height() ); } void KDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -290,7 +290,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel ) if( d->showToDesktopButton ) d->toDesktopButton->show(); } - tqlayout->activate(); + layout->activate(); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || @@ -317,73 +317,73 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) { if ( !nd ) return; - delete tqlayout; - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + delete layout; + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); delete drag; drag = nd; - if (drag->tqparentWidget()!=this) { + if (drag->parentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->dummy ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( stayButton ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->dummy ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( stayButton ); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || closeButton->isVisibleTo(this); for (TQPtrListIterator it( d->btns );it.current();++it) { - tqlayout->addWidget(it.current()); + layout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); - kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<tqminimumSize().height()<addWidget( closeButton ); + layout->activate(); + kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<minimumSize().height()<setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (!btn) return; - if (btn->tqparentWidget()!=this) { + if (btn->parentWidget()!=this) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn); + if (!d->btns.containsRef(btn)) d->btns.append(btn); btn->show(); - delete tqlayout; - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + delete layout; + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( d->dummy); - tqlayout->addWidget( stayButton ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( d->dummy); + layout->addWidget( stayButton ); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || closeButton->isVisibleTo(this); for (TQPtrListIterator it( d->btns );it.current();++it) { - tqlayout->addWidget(it.current()); + layout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + layout->addWidget( closeButton ); + layout->activate(); + drag->setFixedHeight( layout->minimumSize().height() ); } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { - if (btn->tqparentWidget()==this) { - if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); + if (btn->parentWidget()==this) { + if (d->btns.containsRef(btn)) d->btns.removeRef(btn); delete btn; } } @@ -494,8 +494,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP d->_parent = parent; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; manager->childDock->append( this ); @@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); + style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -745,15 +745,15 @@ void KDockWidget::setHeader( KDockWidgetAbstractHeader* h ) if ( header ){ delete header; - delete tqlayout; + delete layout; header = h; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( header ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); + layout->addWidget( header ); setWidget( widget ); } else { header = h; - tqlayout->addWidget( header ); + layout->addWidget( header ); } kdDebug(282)<setMargin(0); + layout->setMargin(0); setMouseTracking(false); setCursor(TQCursor(ArrowCursor)); #endif @@ -791,7 +791,7 @@ void KDockWidget::updateHeader() header->setTopLevel( true ); header->show(); #ifdef BORDERLESS_WINDOWS - tqlayout->setMargin(2*style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this)); + layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); setMouseTracking(true); #endif } @@ -810,7 +810,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) } if ( manager && s == manager->main ){ - setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) ); + setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) ); } if ( !s ) @@ -858,7 +858,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } #endif @@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable { d->_parent = parent; d->transient = transientEnabled; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( tqparentWidget() ){ + if ( parentWidget() ){ if ( parent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(parent()))->updateName(); } @@ -917,7 +917,7 @@ bool KDockWidget::event( TQEvent *event ) return TQWidget::event( event ); } -KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos) +KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; @@ -930,7 +930,7 @@ KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos) static_cast(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast(parent()->parent())->tqfindNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -938,7 +938,7 @@ KDockWidget *KDockWidget::tqfindNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast(parent()->parent())->tqfindNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -1091,7 +1091,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // create a new dockwidget that will contain the target and this - TQWidget* parentDock = target->tqparentWidget(); + TQWidget* parentDock = target->parentWidget(); KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(""), parentDock ); newDock->currentDockPos = target->currentDockPos; @@ -1107,7 +1107,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( !parentDock ){ // dock to a toplevel dockwidget means newDock is toplevel now newDock->move( target->frameGeometry().topLeft() ); - newDock->resize( target->tqgeometry().size() ); + newDock->resize( target->geometry().size() ); if ( target->isVisibleToTLW() ) newDock->show(); } @@ -1142,7 +1142,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, tab->insertTab( this, icon() ? *icon() : TQPixmap(), tabPageLabel(), tabIndex ); - TQRect geom=newDock->tqgeometry(); + TQRect geom=newDock->geometry(); TQWidget *wantTransient=tab->transientTo(); newDock->setDockWindowTransient(wantTransient,wantTransient); newDock->setGeometry(geom); @@ -1209,7 +1209,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, newDock->show(); emit target->docking( this, dockPos ); - emit manager->tqreplaceDock( target, newDock ); + emit manager->replaceDock( target, newDock ); emit manager->change(); return newDock; @@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !parent() ) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } @@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if (candidate && dynamic_cast(candidate)) return candidate; return 0L; } @@ -1295,7 +1295,7 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* parentW = tqparentWidget(); + TQWidget* parentW = parentWidget(); if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) @@ -1337,7 +1337,7 @@ void KDockWidget::undock() KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup - TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget(); + TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { @@ -1365,7 +1365,7 @@ void KDockWidget::undock() lastTab->show(); } manager->blockSignals(false); - emit manager->tqreplaceDock( parentOfTab, lastTab ); + emit manager->replaceDock( parentOfTab, lastTab ); lastTab->currentDockPos = parentOfTab->currentDockPos; emit parentOfTab->iMBeingClosed(); manager->blockSignals(true); @@ -1396,16 +1396,16 @@ void KDockWidget::undock() d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget(); + KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget(); setFormerBrotherDockWidget(secondWidget); applyToWidget( 0L ); group->hide(); - if ( !group->tqparentWidget() ){ + if ( !group->parentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); secondWidget->resize( group->width(), group->height() ); } else { - TQWidget* obj = group->tqparentWidget(); + TQWidget* obj = group->parentWidget(); secondWidget->applyToWidget( obj ); if ( obj->inherits("KDockSplitter") ){ KDockSplitter* parentOfGroup = (KDockSplitter*)obj; @@ -1421,7 +1421,7 @@ void KDockWidget::undock() secondWidget->formerDockPos = group->formerDockPos; delete parentSplitterOfDockWidget; manager->blockSignals(false); - emit manager->tqreplaceDock( group, secondWidget ); + emit manager->replaceDock( group, secondWidget ); emit group->iMBeingClosed(); manager->blockSignals(true); delete group; @@ -1457,10 +1457,10 @@ void KDockWidget::setWidget( TQWidget* mw ) if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor)); #endif widget = mw; - delete tqlayout; + delete layout; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); KDockContainer* dc = dynamic_cast(widget); if (dc) @@ -1475,8 +1475,8 @@ void KDockWidget::setWidget( TQWidget* mw ) { header->show(); - tqlayout->addWidget( header ); - tqlayout->addWidget( widget,1 ); + layout->addWidget( header ); + layout->addWidget( widget,1 ); } updateHeader(); emit widgetSet(mw); @@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) listOfCaption.remove( listOfCaption.length()-1, 1 ); listOfName.remove( listOfName.length()-1, 1 ); - tab->tqparentWidget()->setName( listOfName.utf8() ); - tab->tqparentWidget()->setCaption( listOfCaption ); + tab->parentWidget()->setName( listOfName.utf8() ); + tab->parentWidget()->setCaption( listOfCaption ); - tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint - if ( tab->tqparentWidget()->parent() ) - if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName(); + tab->parentWidget()->repaint( false ); // KDockWidget->repaint + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible() } if ( isVisible() ) return; - TQWidget* p = tqparentWidget(); + TQWidget* p = parentWidget(); while ( p ){ if ( !p->isVisible() ) p->show(); - p = p->tqparentWidget(); + p = p->parentWidget(); } if( !parent() ) // is undocked dockBack(); @@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - tqrepaint(); + repaint(); } void KDockWidget::dockBack() @@ -1723,16 +1723,16 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); - tqApp->processOneEvent(); + qApp->processOneEvent(); currentDragWidget = curdw; currentMoveWidget = 0L; childDockWidgetList = new TQWidgetList(); childDockWidgetList->append( curdw ); - tqfindChildDockWidget( curdw, childDockWidgetList ); + findChildDockWidget( curdw, childDockWidgetList ); //d->oldDragRect = TQRect(); should fix rectangle not erased problem - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1754,7 +1754,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; //d->oldDragRect = TQRect(); should fix rectangle not erased problem - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1775,17 +1775,17 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (!curdw->parent()) { curdw->move(TQCursor::pos()-d->dragOffset); - pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) ); + pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) ); oldMoveWidget = currentMoveWidget; } else { - pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos() ); + pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos() ); oldMoveWidget = currentMoveWidget; } //END TEST #else - pDockWdgAtCursor = tqfindDockWidgetAt( TQCursor::pos() ); + pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos() ); KDockWidget* oldMoveWidget = currentMoveWidget; #endif @@ -1794,7 +1794,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; } else { if (dropCancel && curdw) { - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); }else @@ -1835,7 +1835,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) return TQObject::eventFilter( obj, event ); } -KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos ) +KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) { dropCancel = true; @@ -1850,10 +1850,10 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos ) return 0L; } #if defined(_OS_WIN32_) || defined(Q_OS_WIN32) - p = p->tqtopLevelWidget(); + p = p->topLevelWidget(); #endif TQWidget* w = 0L; - tqfindChildDockWidget( w, p, p->mapFromGlobal(pos) ); + findChildDockWidget( w, p, p->mapFromGlobal(pos) ); if ( !w ){ if ( !p->inherits("KDockWidget") ) { return 0L; @@ -1865,7 +1865,7 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos ) if (dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; - if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; + if ( childDockWidgetList->find(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; @@ -1901,7 +1901,7 @@ KDockWidget* KDockManager::tqfindDockWidgetAt( const TQPoint& pos ) return www; } -void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos ) +void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos ) { if ( p->children() ) { TQWidget *w; @@ -1910,9 +1910,9 @@ void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, cons while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) { + if ( w->isVisible() && w->geometry().contains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; - tqfindChildDockWidget( ww, w, w->mapFromParent(pos) ); + findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; } } @@ -1922,7 +1922,7 @@ void KDockManager::tqfindChildDockWidget( TQWidget*& ww, const TQWidget* p, cons return; } -void KDockManager::tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& list ) +void KDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList*& list ) { if ( p->children() ) { TQWidget *w; @@ -1933,7 +1933,7 @@ void KDockManager::tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& list w = (TQWidget*)it.current(); if ( w->isVisible() ) { if ( w->inherits("KDockWidget") ) list->append( w ); - tqfindChildDockWidget( w, list ); + findChildDockWidget( w, list ); } } --it; @@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->tqparentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); + if ( w->parentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); } } @@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b) { - return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false")); + return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false")); } @@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName, TQStrListIterator it(list); for (; it.current(); ++it) { TQDomElement subel = doc.createElement(subTagName); - subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current()))); + subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current()))); el.appendChild(subel); } @@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base) KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { if ( obj1->parent() == main ) - mainWidgetStr = TQString::tqfromLatin1(obj1->name()); + mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; } @@ -2230,8 +2230,8 @@ void KDockManager::writeConfig(TQDomElement &base) TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ) { KDockWidget *obj = getDockWidgetFromName( *nListIt); - if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1 - || nameList.tqfind(obj->lastName.latin1()) == -1)) { + if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 + || nameList.find(obj->lastName.latin1()) == -1)) { // Skip until children are saved (why?) ++nListIt; // nList.next(); @@ -2279,10 +2279,10 @@ void KDockManager::writeConfig(TQDomElement &base) } } - groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); + groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name()))); groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); if ( !obj->parent() ) { - groupEl.appendChild(createRectEntry(doc, "tqgeometry", TQRect(main->frameGeometry().topLeft(), main->size()))); + groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible())); } if (obj->header && obj->header->inherits("KDockWidgetHeader")) { @@ -2306,7 +2306,7 @@ void KDockManager::writeConfig(TQDomElement &base) base.appendChild(createStringEntry(doc, "mainWidget", mainWidgetStr)); } - base.appendChild(createRectEntry(doc, "tqgeometry", TQRect(main->frameGeometry().topLeft(), main->size()))); + base.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); } @@ -2350,7 +2350,7 @@ void KDockManager::readConfig(TQDomElement &base) obj->setToolTipString(stringEntry(childEl, "tabToolTip")); if (!boolEntry(childEl, "hasParent")) { - TQRect r = rectEntry(childEl, "tqgeometry"); + TQRect r = rectEntry(childEl, "geometry"); obj = getDockWidgetFromName(stringEntry(childEl, "name")); obj->applyToWidget(0); obj->setGeometry(r); @@ -2434,7 +2434,7 @@ void KDockManager::readConfig(TQDomElement &base) } if (!boolEntry(childEl, "hasParent")) { - TQRect r = rectEntry(childEl, "tqgeometry"); + TQRect r = rectEntry(childEl, "geometry"); obj = getDockWidgetFromName(stringEntry(childEl, "name")); obj->applyToWidget(0); obj->setGeometry(r); @@ -2495,7 +2495,7 @@ void KDockManager::readConfig(TQDomElement &base) } // only resize + move non-mainwindows - TQRect mr = rectEntry(base, "tqgeometry"); + TQRect mr = rectEntry(base, "geometry"); main->move(mr.topLeft()); main->resize(mr.size()); } @@ -2538,7 +2538,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( "Version", DOCK_CONFIG_VERSION ); TQStringList nameList; - TQStringList tqfindList; + TQStringList findList; TQObjectListIt it( *childDock ); KDockWidget * obj; @@ -2578,12 +2578,12 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } /*************************************************************************************************/ if ( obj->isGroup ){ - if ( (tqfindList.tqfind( obj->firstName ) != tqfindList.end()) && (tqfindList.tqfind( obj->lastName ) != tqfindList.end() )){ + if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { c->writeEntry( cname+":parent", "yes"); @@ -2594,16 +2594,16 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":sepPos", ((KDockSplitter*)obj->widget)->separatorPosInPercent() ); nameList.append( obj->name() ); - tqfindList.append( obj->name() ); + findList.append( obj->name() ); //debug(" Save %s", nList.current()); nList.remove(nListIt); nListIt=nList.begin(); //nList.first(); } else { /*************************************************************************************************/ //debug(" Skip %s", nList.current()); - //if ( tqfindList.tqfind( obj->firstName ) == -1 ) + //if ( findList.find( obj->firstName ) == -1 ) // debug(" ? Not found %s", obj->firstName); - //if ( tqfindList.tqfind( obj->lastName ) == -1 ) + //if ( findList.find( obj->lastName ) == -1 ) // debug(" ? Not found %s", obj->lastName); ++nListIt; // if ( !nList.current() ) nList.first(); @@ -2615,7 +2615,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":type", "TAB_GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""); c->writeEntry( cname+":dockBackToPos", obj->formerDockPos); @@ -2629,7 +2629,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":curTab", ((KDockTabGroup*)obj->widget)->currentPageIndex() ); nameList.append( obj->name() ); - tqfindList.append( obj->name() ); // not really need !!! + findList.append( obj->name() ); // not really need !!! //debug(" Save %s", nList.current()); nList.remove(nListIt); nListIt=nList.begin(); @@ -2639,7 +2639,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":tabToolTip", obj->toolTipString()); if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""); c->writeEntry( cname+":dockBackToPos", obj->formerDockPos); @@ -2648,7 +2648,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } nameList.append( cname.latin1() ); //debug(" Save %s", nList.current()); - tqfindList.append( obj->name() ); + findList.append( obj->name() ); nList.remove(nListIt); nListIt=nList.begin(); } @@ -2714,7 +2714,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) obj = 0L; if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ - TQRect r = c->readRectEntry( oname + ":tqgeometry" ); + TQRect r = c->readRectEntry( oname + ":geometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); obj->setGeometry(r); @@ -2954,7 +2954,7 @@ void KDockManager::slotMenuActivated( int id ) data->dock->changeHideShowState(); } -KDockWidget* KDockManager::tqfindWidgetParentDock( TQWidget* w ) const +KDockWidget* KDockManager::findWidgetParentDock( TQWidget* w ) const { TQObjectListIt it( *childDock ); KDockWidget * dock; @@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle() KDockMainWindow* pMain = 0L; KDockWidget* pTLDockWdg = 0L; TQWidget* topWdg; - if (pDockWdgAtRect->tqtopLevelWidget() == main) { + if (pDockWdgAtRect->topLevelWidget() == main) { isOverMainWdg = true; topWdg = pMain = (KDockMainWindow*) main; unclipped = pMain->testWFlags( WPaintUnclipped ); pMain->setWFlags( WPaintUnclipped ); } else { - topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget(); + topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget(); unclipped = pTLDockWdg->testWFlags( WPaintUnclipped ); pTLDockWdg->setWFlags( WPaintUnclipped ); } @@ -3077,7 +3077,7 @@ void KDockArea::makeDockInvisible( KDockWidget* dock ) void KDockArea::makeWidgetDockVisible( TQWidget* widget ) { - makeDockVisible( dockManager->tqfindWidgetParentDock(widget) ); + makeDockVisible( dockManager->findWidgetParentDock(widget) ); } void KDockArea::writeDockConfig(TQDomElement &base) @@ -3326,6 +3326,6 @@ void KDockArea::virtual_hook( int, void* ) { /*KMainWindow::virtual_hook( id, data );*/ } -#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget.moc" #endif diff --git a/kdeui/kdockwidget.h b/kdeui/kdockwidget.h index 35d05542c..4f1605c8c 100644 --- a/kdeui/kdockwidget.h +++ b/kdeui/kdockwidget.h @@ -322,9 +322,9 @@ protected slots: protected: /** - * A tqlayout manager for placing the embedded buttons (close and stay) + * A layout manager for placing the embedded buttons (close and stay) */ - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; /** * a little button for closing (undocking and hiding) the dockwidget @@ -446,7 +446,7 @@ public: */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, - const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0); + const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0); /** * Destructs a dockwidget. @@ -479,8 +479,8 @@ public: * * If the target is null, it will become a toplevel dockwidget at position pos; * Note: Docking to another dockwidget means exactly: - * A new parent dockwidget will be created, that tqreplaces the target dockwidget and tqcontains another single helper widget (tab widget or panner) - * which tqcontains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions. + * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) + * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions. * * @param target The dockwidget to dock to * @param dockPos One of the DockPositions this is going to dock to @@ -488,7 +488,7 @@ public: * @param pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget) * @param check Only for internal use; * @param tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append - * @return result The group dockwidget that tqreplaces the target dockwidget and will be grandparent of target and @p this. + * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this. * * @note Since KDE 3.5 the splitter position @p spliPos is always a value between [0..100]. If * the value is > 100, it will be treated like the old code and normalized to a value between @@ -541,7 +541,7 @@ public: * Sets the header of this dockwidget. * * A TQLayout takes care about proper resizing, automatically. - * The header tqcontains the drag panel, the close button and the stay button. + * The header contains the drag panel, the close button and the stay button. * * @param ah A base class pointer to the dockwidget header */ @@ -659,7 +659,7 @@ public: * @param pos is the position the wanted widget is docked to this one * @since 3.1 */ - KDockWidget *tqfindNearestDockWidget(DockPosition pos); + KDockWidget *findNearestDockWidget(DockPosition pos); /** * Allows changing the pixmap which is used for the caption or dock tabs @@ -853,9 +853,9 @@ private: TQWidget* widget; /** - * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header + * the layout manager that takes care about proper resizing and moving the embedded widget and the header */ - TQVBoxLayout* tqlayout; + TQVBoxLayout* layout; /** * the responsible dockmanager @@ -906,7 +906,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockManager: public TQObject +class KDEUI_EXPORT KDockManager: public QObject { Q_OBJECT friend class KDockWidget; @@ -942,7 +942,7 @@ public: #ifndef NO_KDE2 /** * Saves the current state of the dockmanager and of all controlled widgets. - * State means here to save the tqgeometry, visibility, parents, internal object names, orientation, + * State means here to save the geometry, visibility, parents, internal object names, orientation, * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and * last but not least some necessary things for recovering the dockmainwindow state. * @@ -957,9 +957,9 @@ public: * In order to restore a window configuration * from a config file, it looks up widgets by name * (TQObject::name) in the childDock variable of - * KDockManager. This list in turn tqcontains all + * KDockManager. This list in turn contains all * KDockWidgets (according to the KDockWidget constructor). - * So in principle, in order to restore a window tqlayout, + * So in principle, in order to restore a window layout, * one must first construct all widgets, put each of them in a * KDockWidget and then call readConfig(). And for all that * to work, each widget must have a unique name. @@ -974,11 +974,11 @@ public: void setMainDockWidget2(KDockWidget *); /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readConfig(TQDomElement &base); @@ -999,20 +999,20 @@ public: virtual bool eventFilter( TQObject * object, TQEvent * event ); /** - * This method tqfinds out what a widgets' dockwidget is. That means the dockmanager has a look at all + * This method finds out what a widgets' dockwidget is. That means the dockmanager has a look at all * dockwidgets it knows and tells you when one of those dockwidgets covers the given widget. * * @param w any widget that is supposed to be encapsulated by one of the controlled dockwidgets * @return the dockwidget that encapsulates that widget, otherwise 0 */ - KDockWidget* tqfindWidgetParentDock( TQWidget* w) const; + KDockWidget* findWidgetParentDock( TQWidget* w) const; /** * Works like makeDockVisible() but can be called for widgets that covered by a dockwidget. * * @param w the widget that is encapsulated by a dockwidget that turns to visible. */ - void makeWidgetDockVisible( TQWidget* w ){ tqfindWidgetParentDock(w)->makeDockVisible(); } + void makeWidgetDockVisible( TQWidget* w ){ findWidgetParentDock(w)->makeDockVisible(); } /** * @return the popupmenu for showing/hiding dockwidgets @@ -1083,9 +1083,9 @@ signals: void change(); /** - * Signals a dockwidget is tqreplaced with another one. + * Signals a dockwidget is replaced with another one. */ - void tqreplaceDock( KDockWidget* oldDock, KDockWidget* newDock ); + void replaceDock( KDockWidget* oldDock, KDockWidget* newDock ); /** * Signals a dockwidget without parent (toplevel) is shown. @@ -1136,7 +1136,7 @@ private: * @param pos global (desktop) position of the wanted dockwidget * @return the dockwidget at that position */ - KDockWidget* tqfindDockWidgetAt( const TQPoint& pos ); + KDockWidget* findDockWidgetAt( const TQPoint& pos ); /** * Finds the TQWidget recursively at the position given as parameter @@ -1145,15 +1145,15 @@ private: * @param p the parent widget where the recursive search should start from * @param pos global (desktop) position of the wanted dockwidget */ - void tqfindChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos ); + void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos ); /** * Finds all dockwidgets which are child, grandchild and so on of p. * * @param p the parent widget where the recursive search starts from - * @param l the widget list that tqcontains the search result after the return of this method + * @param l the widget list that contains the search result after the return of this method */ - void tqfindChildDockWidget( const TQWidget* p, TQWidgetList*& l); + void findChildDockWidget( const TQWidget* p, TQWidgetList*& l); /** * Sets a dockwidget in drag mode. @@ -1197,7 +1197,7 @@ private: KDockWidget* currentMoveWidget; // widget where mouse moving /** - * It is of interest during the dock process. Then it tqcontains all child dockwidgets. + * It is of interest during the dock process. Then it contains all child dockwidgets. */ TQWidgetList* childDockWidgetList; @@ -1244,7 +1244,7 @@ private: bool dropCancel; /** - * A popup menu that tqcontains one menuitem for each dockwidget that shows the current visibility state and + * A popup menu that contains one menuitem for each dockwidget that shows the current visibility state and * to show or hide the appropriate dockwidget. */ TQPopupMenu* menu; @@ -1365,14 +1365,14 @@ public: * @return a pointer to the new created dockwidget */ KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeDockConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readDockConfig(TQDomElement &base); @@ -1402,7 +1402,7 @@ public: void activateDock(){ dockManager->activate(); } /** - * Returns a popup menu that tqcontains entries for all controlled dockwidgets making hiding and showing + * Returns a popup menu that contains entries for all controlled dockwidgets making hiding and showing * them possible. * * @return the wanted popup menu @@ -1490,7 +1490,7 @@ public: KDockWidget* getMainDockWidget(){ return mainDockWidget; } KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 12c1b32f0..9c98ae69a 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -281,7 +281,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // xpos should not change, the docking is on the top // checkValue is *fuzzy* here, it leads to ugly rounding bugs // In truth, it is not needed, because it is called when calculating the "position". - xpos = tqRound(((double)xpos) * ev->oldSize().height() / height()); + xpos = qRound(((double)xpos) * ev->oldSize().height() / height()); } } } else { @@ -291,7 +291,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { // xpos should not change // checkValue is *fuzzy* here, it leads to ugly rounding bugs - xpos = tqRound(((double)xpos) * ev->oldSize().width() / width()); + xpos = qRound(((double)xpos) * ev->oldSize().width() / width()); } } } @@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } } } else { @@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } } } @@ -546,7 +546,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) { @@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } handled= true; break; @@ -585,15 +585,15 @@ void KDockSplitter::updateName() if ( !initialised ) return; TQString new_name = TQString( child0->name() ) + "," + child1->name(); - tqparentWidget()->setName( new_name.latin1() ); - tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - tqparentWidget()->tqrepaint( false ); + parentWidget()->setName( new_name.latin1() ); + parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); + parentWidget()->repaint( false ); - ((KDockWidget*)tqparentWidget())->firstName = child0->name(); - ((KDockWidget*)tqparentWidget())->lastName = child1->name(); - ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation; + ((KDockWidget*)parentWidget())->firstName = child0->name(); + ((KDockWidget*)parentWidget())->lastName = child1->name(); + ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation; - TQWidget* p = tqparentWidget()->tqparentWidget(); + TQWidget* p = parentWidget()->parentWidget(); if ( p && p->inherits("KDockSplitter" ) ) ((KDockSplitter*)p)->updateName(); } @@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private() void KDockButton_Private::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if ( moveMouse && !isDown() ){ p->setPen( white ); @@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if ( isOn() || isDown() ){ - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); @@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p ) void KDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - tqrepaint(); + repaint(); } void KDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - tqrepaint(); + repaint(); } /*************************************************************************/ @@ -707,6 +707,6 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) } } -#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget_private.moc" #endif diff --git a/kdeui/kdockwidget_private.h b/kdeui/kdockwidget_private.h index ccc38ffd0..c017f1d14 100644 --- a/kdeui/kdockwidget_private.h +++ b/kdeui/kdockwidget_private.h @@ -61,7 +61,7 @@ public: /** * Initialize the splitter. If @p c0 or @p c1 is 0L the child will not - * be tqreplaced. So if you want to change @p c1 and not change c0, you'd + * be replaced. So if you want to change @p c1 and not change c0, you'd * call @p activate(0L,new_widget); * * @param c0 the widget on top/left @@ -270,7 +270,7 @@ private: /** * additional KDockWidget stuff (private) */ -class KDockWidgetPrivate : public TQObject +class KDockWidgetPrivate : public QObject { Q_OBJECT public: @@ -311,7 +311,7 @@ public: }; class KDockWidgetHeaderPrivate - : public TQObject + : public QObject { public: KDockWidgetHeaderPrivate( TQObject* parent ) diff --git a/kdeui/kdualcolorbutton.cpp b/kdeui/kdualcolorbutton.cpp index 2ecbce5fd..2b4c2ecfd 100644 --- a/kdeui/kdualcolorbutton.cpp +++ b/kdeui/kdualcolorbutton.cpp @@ -51,8 +51,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget* curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(tqsizeHint().isValid()) - setMinimumSize(tqsizeHint()); + if(sizeHint().isValid()) + setMinimumSize(sizeHint()); setAcceptDrops(true); } @@ -72,8 +72,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(tqsizeHint().isValid()) - setMinimumSize(tqsizeHint()); + if(sizeHint().isValid()) + setMinimumSize(sizeHint()); setAcceptDrops(true); } @@ -104,7 +104,7 @@ TQColor KDualColorButton::currentColor() const return (curColor == Background ? bg.color() : fg.color()); } -TQSize KDualColorButton::tqsizeHint() const +TQSize KDualColorButton::sizeHint() const { return TQSize(34, 34); } @@ -112,7 +112,7 @@ TQSize KDualColorButton::tqsizeHint() const void KDualColorButton::setForeground(const TQColor &c) { fg = TQBrush(c, SolidPattern); - tqrepaint(false); + repaint(false); emit fgChanged(fg.color()); } @@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c) void KDualColorButton::setBackground(const TQColor &c) { bg = TQBrush(c, SolidPattern); - tqrepaint(false); + repaint(false); emit bgChanged(bg.color()); } @@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c) bg = TQBrush(c, SolidPattern); else fg = TQBrush(c, SolidPattern); - tqrepaint(false); + repaint(false); } void KDualColorButton::setCurrent(DualColor s) { curColor = s; - tqrepaint(false); + repaint(false); } void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect) @@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *) TQPainter p(this); metrics(fgRect, bgRect); - TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button); + TQBrush defBrush = colorGroup().brush(TQColorGroup::Button); - qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0, + qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0, isEnabled() ? &bg : &defBrush); - qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0, + qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0, isEnabled() ? &fg : &defBrush); - p.setPen(tqcolorGroup().shadow()); + p.setPen(colorGroup().shadow()); p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap); p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap); @@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev) bg.setColor(c); emit(bgChanged(c)); } - tqrepaint(false); + repaint(false); } } @@ -192,11 +192,11 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) mPos = ev->pos(); tmpColor = curColor; dragFlag = false; - if(fgRect.tqcontains(mPos)){ + if(fgRect.contains(mPos)){ curColor = Foreground; miniCtlFlag = false; } - else if(bgRect.tqcontains(mPos)){ + else if(bgRect.contains(mPos)){ curColor = Background; miniCtlFlag = false; } @@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) emit bgChanged(bg.color()); miniCtlFlag = true; } - tqrepaint(false); + repaint(false); } @@ -244,7 +244,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) metrics(fgRect, bgRect); if(dragFlag) curColor = tmpColor; - else if(fgRect.tqcontains(ev->pos()) && curColor == Foreground){ + else if(fgRect.contains(ev->pos()) && curColor == Foreground){ if(tmpColor == Background){ curColor = Foreground; emit currentChanged(Foreground); @@ -257,7 +257,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) } } } - else if(bgRect.tqcontains(ev->pos()) && curColor == Background){ + else if(bgRect.contains(ev->pos()) && curColor == Background){ if(tmpColor == Foreground){ curColor = Background; emit currentChanged(Background); @@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) } } } - tqrepaint(false); + repaint(false); dragFlag = false; } else diff --git a/kdeui/kdualcolorbutton.h b/kdeui/kdualcolorbutton.h index d246e68bf..7b08ec0e3 100644 --- a/kdeui/kdualcolorbutton.h +++ b/kdeui/kdualcolorbutton.h @@ -94,7 +94,7 @@ public: * Returns the minimum size needed to display the widget and all its * controls. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: /** * Sets the foreground color. @@ -128,7 +128,7 @@ signals: protected: /** * Sets the supplied rectangles to the proper size and position for the - * current widget size. You can reimplement this to change the tqlayout + * current widget size. You can reimplement this to change the layout * of the widget. Restrictions are that the swap control will always * be at the top right, the reset control will always be at the bottom * left, and you must leave at least a 14x14 space in those corners. diff --git a/kdeui/keditcl.h b/kdeui/keditcl.h index c3f58b9c4..19f828c2b 100644 --- a/kdeui/keditcl.h +++ b/kdeui/keditcl.h @@ -126,10 +126,10 @@ public: KHistoryCombo *searchCombo() const; /** - * @returns the combobox containing the history of tqreplaces. Can be used + * @returns the combobox containing the history of replaces. Can be used * to save and restore the history. */ - KHistoryCombo *tqreplaceCombo() const; + KHistoryCombo *replaceCombo() const; bool case_sensitive(); bool get_direction(); @@ -149,9 +149,9 @@ private: virtual void done(int i ) { KDialogBase::done(i); } signals: - void tqreplace(); - void tqfind(); - void tqreplaceAll(); + void replace(); + void find(); + void replaceAll(); void done(); protected: virtual void virtual_hook( int id, void* data ); @@ -194,7 +194,7 @@ public: /** * Save text from the edit widget to a text stream. - * If @p softWrap is false soft line wrappings are tqreplaced with line-feeds + * If @p softWrap is false soft line wrappings are replaced with line-feeds * If @p softWrap is true soft line wrappings are ignored. * @since 3.1 **/ @@ -225,7 +225,7 @@ public: /** * Present a Search and Replace Dialog to the user. **/ - void tqreplace(); + void replace(); /** * Present a "Goto Line" dialog to the user. @@ -340,22 +340,22 @@ private slots: /** * @internal **/ - void tqreplace_slot(); + void replace_slot(); /** * @internal **/ - void tqreplace_all_slot(); + void replace_all_slot(); /** * @internal **/ - void tqreplace_search_slot(); + void replace_search_slot(); /** * @internal **/ - void tqreplacedone_slot(); + void replacedone_slot(); /** * Cursor moved... @@ -368,7 +368,7 @@ protected: bool regex, bool forward,int line, int col); int doReplace(TQString s_pattern, bool case_sensitive, - bool regex, bool forward,int line, int col,bool tqreplace); + bool regex, bool forward,int line, int col,bool replace); /** * Sets line and col to the position pos, considering word wrap. @@ -401,25 +401,25 @@ protected: void contentsDropEvent(TQDropEvent* e); private: - TQTimer* tqrepaintTimer; + TQTimer* repaintTimer; QString killbufferstring; TQWidget *parent; KEdFind *srchdialog; - KEdReplace *tqreplace_dialog; + KEdReplace *replace_dialog; KEdGotoLine *gotodialog; TQString pattern; - bool can_tqreplace; + bool can_replace; bool killing; bool killtrue; bool lastwasanewline; bool saved_readonlystate; int last_search; - int last_tqreplace; - int tqreplace_all_line; - int tqreplace_all_col; + int last_replace; + int replace_all_line; + int replace_all_col; int line_pos, col_pos; bool fill_column_is_set; diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp index 0b8ebea12..a77e1c523 100644 --- a/kdeui/keditcl1.cpp +++ b/kdeui/keditcl1.cpp @@ -61,7 +61,7 @@ KEdit::KEdit(TQWidget *_parent, const char *name) line_pos = col_pos = 0; srchdialog = NULL; - tqreplace_dialog= NULL; + replace_dialog= NULL; gotodialog = NULL; setAcceptDrops(true); @@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream) setCursorPosition(saveline, savecol); // setAutoUpdate(true); -// tqrepaint(); +// repaint(); setModified(true); setFocus(); @@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream) // TQString str = text(); // for (int i = 0; i < (int) str.length(); i++) - // printf("KEdit: U+%04X\n", str[i].tqunicode()); + // printf("KEdit: U+%04X\n", str[i].unicode()); } @@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace() if (line.isEmpty()) { if (addSpace) - newText += TQString::tqfromLatin1("\n\n"); + newText += TQString::fromLatin1("\n\n"); if (firstLine) { if (firstChar.isSpace()) @@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace() { deselect(); d->autoUpdate = true; - tqrepaint(); + repaint(); return; } if (wordWrap() == NoWrap) @@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace() insert(newText); d->autoUpdate = true; - tqrepaint(); + repaint(); setModified(true); setFocus(); @@ -350,7 +350,7 @@ void KEdit::computePosition() int coltemp = col-start_of_line; int pos = 0; - int tqfind = 0; + int find = 0; int mem = 0; bool found_one = false; @@ -358,14 +358,14 @@ void KEdit::computePosition() // kedit+ sources -- if not, go away ;-) - while(tqfind >=0 && tqfind <= coltemp- 1 ){ - tqfind = linetext.tqfind('\t', tqfind+start_of_line, true )-start_of_line; - if( tqfind >=0 && tqfind <= coltemp - 1 ){ + while(find >=0 && find <= coltemp- 1 ){ + find = linetext.find('\t', find+start_of_line, true )-start_of_line; + if( find >=0 && find <= coltemp - 1 ){ found_one = true; - pos = pos + tqfind - mem; + pos = pos + find - mem; pos = pos + 8 - pos % 8; - mem = tqfind; - tqfind ++; + mem = find; + find ++; } } @@ -466,48 +466,48 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) killing = false; - if ( KStdAccel::copy().tqcontains( key ) ) + if ( KStdAccel::copy().contains( key ) ) copy(); else if ( isReadOnly() ) TQMultiLineEdit::keyPressEvent( e ); // If this is an unmodified printable key, send it directly to TQMultiLineEdit. - else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().tqunicode()->isPrint() ) + else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().unicode()->isPrint() ) TQMultiLineEdit::keyPressEvent( e ); - else if ( KStdAccel::paste().tqcontains( key ) ) { + else if ( KStdAccel::paste().contains( key ) ) { paste(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::cut().tqcontains( key ) ) { + else if ( KStdAccel::cut().contains( key ) ) { cut(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::undo().tqcontains( key ) ) { + else if ( KStdAccel::undo().contains( key ) ) { undo(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::redo().tqcontains( key ) ) { + else if ( KStdAccel::redo().contains( key ) ) { redo(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::deleteWordBack().tqcontains( key ) ) { + else if ( KStdAccel::deleteWordBack().contains( key ) ) { moveCursor(MoveWordBackward, true); if (hasSelectedText()) del(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::deleteWordForward().tqcontains( key ) ) { + else if ( KStdAccel::deleteWordForward().contains( key ) ) { moveCursor(MoveWordForward, true); if (hasSelectedText()) del(); setModified(true); slotCursorPositionChanged(); } - else if ( KStdAccel::backwardWord().tqcontains( key ) ) { + else if ( KStdAccel::backwardWord().contains( key ) ) { CursorAction action = MoveWordBackward; int para, index; getCursorPosition( ¶, & index ); @@ -516,7 +516,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) moveCursor(action, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::forwardWord().tqcontains( key ) ) { + else if ( KStdAccel::forwardWord().contains( key ) ) { CursorAction action = MoveWordForward; int para, index; getCursorPosition( ¶, & index ); @@ -525,27 +525,27 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) moveCursor( action, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::next().tqcontains( key ) ) { + else if ( KStdAccel::next().contains( key ) ) { moveCursor( MovePgDown, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::prior().tqcontains( key ) ) { + else if ( KStdAccel::prior().contains( key ) ) { moveCursor( MovePgUp, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::home().tqcontains( key ) ) { + else if ( KStdAccel::home().contains( key ) ) { moveCursor( MoveHome, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::end().tqcontains( key ) ) { + else if ( KStdAccel::end().contains( key ) ) { moveCursor( MoveEnd, false ); slotCursorPositionChanged(); } - else if ( KStdAccel::beginningOfLine().tqcontains( key ) ) { + else if ( KStdAccel::beginningOfLine().contains( key ) ) { moveCursor( MoveLineStart, false); slotCursorPositionChanged(); } - else if ( KStdAccel::endOfLine().tqcontains( key ) ) { + else if ( KStdAccel::endOfLine().contains( key ) ) { moveCursor( MoveLineEnd, false); slotCursorPositionChanged(); } diff --git a/kdeui/keditcl2.cpp b/kdeui/keditcl2.cpp index f3f8c0bbb..36d1b8f3b 100644 --- a/kdeui/keditcl2.cpp +++ b/kdeui/keditcl2.cpp @@ -50,9 +50,9 @@ void KEdit::search(){ - if( tqreplace_dialog && tqreplace_dialog->isVisible() ) + if( replace_dialog && replace_dialog->isVisible() ) { - tqreplace_dialog->hide(); + replace_dialog->hide(); } if( !srchdialog ) @@ -62,8 +62,8 @@ void KEdit::search(){ connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); } - // If we already searched / tqreplaced something before make sure it shows - // up in the tqfind dialog line-edit. + // If we already searched / replaced something before make sure it shows + // up in the find dialog line-edit. TQString string; string = srchdialog->getText(); @@ -162,7 +162,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); - pos = string.tqfind(s_pattern, i == line ? col : 0, case_sensitive); + pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); if( pos != -1){ @@ -191,7 +191,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); int line_length = string.length(); - pos = string.tqfindRev(s_pattern, line == i ? col : line_length , case_sensitive); + pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive); if (pos != -1){ @@ -244,47 +244,47 @@ bool KEdit::repeatSearch() { // -void KEdit::tqreplace() +void KEdit::replace() { if( srchdialog && srchdialog->isVisible() ) { srchdialog->hide(); } - if( !tqreplace_dialog ) + if( !replace_dialog ) { - tqreplace_dialog = new KEdReplace( this, "tqreplace_dialog", false ); - connect(tqreplace_dialog,TQT_SIGNAL(tqfind()),this,TQT_SLOT(tqreplace_search_slot())); - connect(tqreplace_dialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(tqreplace_slot())); - connect(tqreplace_dialog,TQT_SIGNAL(tqreplaceAll()),this,TQT_SLOT(tqreplace_all_slot())); - connect(tqreplace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(tqreplacedone_slot())); + replace_dialog = new KEdReplace( this, "replace_dialog", false ); + connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot())); + connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot())); + connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot())); + connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot())); } - TQString string = tqreplace_dialog->getText(); - tqreplace_dialog->setText(string.isEmpty() ? pattern : string); + TQString string = replace_dialog->getText(); + replace_dialog->setText(string.isEmpty() ? pattern : string); deselect(); - last_tqreplace = NONE; + last_replace = NONE; - tqreplace_dialog->show(); - tqreplace_dialog->result(); + replace_dialog->show(); + replace_dialog->result(); } -void KEdit::tqreplace_slot(){ +void KEdit::replace_slot(){ - if (!tqreplace_dialog) + if (!replace_dialog) return; - if(!can_tqreplace){ + if(!can_replace){ KNotifyClient::beep(); return; } int line,col, length; - TQString string = tqreplace_dialog->getReplaceText(); + TQString string = replace_dialog->getReplaceText(); length = string.length(); this->cut(); @@ -293,9 +293,9 @@ void KEdit::tqreplace_slot(){ insertAt(string,line,col); setModified(true); - can_tqreplace = false; + can_replace = false; - if (tqreplace_dialog->get_direction()) + if (replace_dialog->get_direction()) { // Backward setCursorPosition(line,col+length); @@ -313,40 +313,40 @@ void KEdit::tqreplace_slot(){ } } -void KEdit::tqreplace_all_slot(){ +void KEdit::replace_all_slot(){ - if (!tqreplace_dialog) + if (!replace_dialog) return; - TQString to_find_string = tqreplace_dialog->getText(); + TQString to_find_string = replace_dialog->getText(); int lineFrom, lineTo, colFrom, colTo; getSelection(&lineFrom, &colFrom, &lineTo, &colTo); - // tqreplace_dialog->get_direction() is true if searching backward - if (tqreplace_dialog->get_direction()) + // replace_dialog->get_direction() is true if searching backward + if (replace_dialog->get_direction()) { if (colTo != -1) { - tqreplace_all_col = colTo - to_find_string.length(); - tqreplace_all_line = lineTo; + replace_all_col = colTo - to_find_string.length(); + replace_all_line = lineTo; } else { - getCursorPosition(&tqreplace_all_line,&tqreplace_all_col); - tqreplace_all_col--; + getCursorPosition(&replace_all_line,&replace_all_col); + replace_all_col--; } } else { if (colFrom != -1) { - tqreplace_all_col = colFrom; - tqreplace_all_line = lineFrom; + replace_all_col = colFrom; + replace_all_line = lineFrom; } else { - getCursorPosition(&tqreplace_all_line,&tqreplace_all_col); + getCursorPosition(&replace_all_line,&replace_all_col); } } @@ -359,16 +359,16 @@ again: while(result){ - result = doReplace(to_find_string, tqreplace_dialog->case_sensitive(), - false, (!tqreplace_dialog->get_direction()), - tqreplace_all_line,tqreplace_all_col,true); + result = doReplace(to_find_string, replace_dialog->case_sensitive(), + false, (!replace_dialog->get_direction()), + replace_all_line,replace_all_col,true); } setAutoUpdate(true); update(); - if(!tqreplace_dialog->get_direction()){ // forward search + if(!replace_dialog->get_direction()){ // forward search int query = KMessageBox::questionYesNo( srchdialog, @@ -376,8 +376,8 @@ again: "Continue from the beginning?"), i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); if (query == KMessageBox::Yes){ - tqreplace_all_line = 0; - tqreplace_all_col = 0; + replace_all_line = 0; + replace_all_col = 0; goto again; } } @@ -390,9 +390,9 @@ again: i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); if (query == KMessageBox::Yes){ TQString string = textLine( numLines() - 1 ); - tqreplace_all_line = numLines() - 1; - tqreplace_all_col = string.length(); - last_tqreplace = BACKWARD; + replace_all_line = numLines() - 1; + replace_all_col = string.length(); + last_replace = BACKWARD; goto again; } } @@ -402,20 +402,20 @@ again: } -void KEdit::tqreplace_search_slot(){ +void KEdit::replace_search_slot(){ int line, col; - if (!tqreplace_dialog) + if (!replace_dialog) return; - TQString to_find_string = tqreplace_dialog->getText(); + TQString to_find_string = replace_dialog->getText(); int lineFrom, lineTo, colFrom, colTo; getSelection(&lineFrom, &colFrom, &lineTo, &colTo); - // tqreplace_dialog->get_direction() is true if searching backward - if (tqreplace_dialog->get_direction()) + // replace_dialog->get_direction() is true if searching backward + if (replace_dialog->get_direction()) { if (colFrom != -1) { @@ -443,14 +443,14 @@ void KEdit::tqreplace_search_slot(){ again: - int result = doReplace(to_find_string, tqreplace_dialog->case_sensitive(), - false, (!tqreplace_dialog->get_direction()), line, col, false ); + int result = doReplace(to_find_string, replace_dialog->case_sensitive(), + false, (!replace_dialog->get_direction()), line, col, false ); if(!result){ - if(!tqreplace_dialog->get_direction()){ // forward search + if(!replace_dialog->get_direction()){ // forward search int query = KMessageBox::questionYesNo( - tqreplace_dialog, + replace_dialog, i18n("End of document reached.\n"\ "Continue from the beginning?"), i18n("Replace"),KStdGuiItem::cont(),i18n("Stop")); @@ -463,7 +463,7 @@ again: else{ //backward search int query = KMessageBox::questionYesNo( - tqreplace_dialog, + replace_dialog, i18n("Beginning of document reached.\n"\ "Continue from the end?"), i18n("Replace"),KStdGuiItem::cont(),i18n("Stop")); @@ -471,7 +471,7 @@ again: TQString string = textLine( numLines() - 1 ); line = numLines() - 1; col = string.length(); - last_tqreplace = BACKWARD; + last_replace = BACKWARD; goto again; } } @@ -484,18 +484,18 @@ again: -void KEdit::tqreplacedone_slot(){ +void KEdit::replacedone_slot(){ - if (!tqreplace_dialog) + if (!replace_dialog) return; - tqreplace_dialog->hide(); - // tqreplace_dialog->clearFocus(); + replace_dialog->hide(); + // replace_dialog->clearFocus(); setFocus(); - last_tqreplace = NONE; - can_tqreplace = false; + last_replace = NONE; + can_replace = false; } @@ -503,7 +503,7 @@ void KEdit::tqreplacedone_slot(){ /* antlarr: KDE 4: make it const TQString & */ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, - bool wildcard, bool forward, int line, int col, bool tqreplace_all){ + bool wildcard, bool forward, int line, int col, bool replace_all){ (void) wildcard; // reserved for possible extension to regex @@ -513,11 +513,11 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, TQString string; TQString stringnew; - TQString tqreplacement; + TQString replacement; - tqreplacement = tqreplace_dialog->getReplaceText(); + replacement = replace_dialog->getReplaceText(); line_counter = line; - tqreplace_all_col = col; + replace_all_col = col; if(forward){ @@ -527,34 +527,34 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, string = textLine(line_counter); - if (tqreplace_all){ - pos = string.tqfind(s_pattern, tqreplace_all_col, case_sensitive); + if (replace_all){ + pos = string.find(s_pattern, replace_all_col, case_sensitive); } else{ - pos = string.tqfind(s_pattern, line_counter == line ? col : 0, case_sensitive); + pos = string.find(s_pattern, line_counter == line ? col : 0, case_sensitive); } if (pos == -1 ){ line_counter++; - tqreplace_all_col = 0; - tqreplace_all_line = line_counter; + replace_all_col = 0; + replace_all_line = line_counter; } if( pos != -1){ length = s_pattern.length(); - if(tqreplace_all){ // automatic + if(replace_all){ // automatic stringnew = string.copy(); do { - stringnew.tqreplace(pos,length,tqreplacement); + stringnew.replace(pos,length,replacement); - tqreplace_all_col = pos + tqreplacement.length(); - tqreplace_all_line = line_counter; + replace_all_col = pos + replacement.length(); + replace_all_line = line_counter; - pos = stringnew.tqfind(s_pattern, tqreplace_all_col, case_sensitive); + pos = stringnew.find(s_pattern, replace_all_col, case_sensitive); } while( pos != -1); @@ -573,8 +573,8 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, setCursorPosition( line_counter , pos + length, true ); pattern = s_pattern; - last_tqreplace = FORWARD; - can_tqreplace = true; + last_replace = FORWARD; + can_replace = true; return 1; @@ -591,55 +591,55 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, int line_length = string.length(); - if( tqreplace_all ){ - if (tqreplace_all_col < 0) + if( replace_all ){ + if (replace_all_col < 0) pos = -1; else - pos = string.tqfindRev(s_pattern, tqreplace_all_col , case_sensitive); + pos = string.findRev(s_pattern, replace_all_col , case_sensitive); } else{ if ((line == line_counter) && (col < 0)) pos = -1; else - pos = string.tqfindRev(s_pattern, + pos = string.findRev(s_pattern, line == line_counter ? col : line_length , case_sensitive); } if (pos == -1 ){ line_counter--; - tqreplace_all_col = 0; + replace_all_col = 0; if(line_counter >= 0){ string = textLine(line_counter); - tqreplace_all_col = string.length(); + replace_all_col = string.length(); } - tqreplace_all_line = line_counter; + replace_all_line = line_counter; } if (pos != -1){ length = s_pattern.length(); - if(tqreplace_all){ // automatic + if(replace_all){ // automatic stringnew = string.copy(); - stringnew.tqreplace(pos,length,tqreplacement); + stringnew.replace(pos,length,replacement); removeLine(line_counter); insertLine(stringnew,line_counter); - tqreplace_all_col = pos-length; - tqreplace_all_line = line_counter; - if (tqreplace_all_col < 0) + replace_all_col = pos-length; + replace_all_line = line_counter; + if (replace_all_col < 0) { line_counter--; if(line_counter >= 0){ string = textLine(line_counter); - tqreplace_all_col = string.length(); + replace_all_col = string.length(); } - tqreplace_all_line = line_counter; + replace_all_line = line_counter; } setModified(true); @@ -658,8 +658,8 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, setCursorPosition(line_counter, pos ,true ); pattern = s_pattern; - last_tqreplace = BACKWARD; - can_tqreplace = true; + last_replace = BACKWARD; + can_replace = true; return 1; } @@ -698,7 +698,7 @@ public: KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) :KDialogBase( parent, name, modal, i18n("Find"), - modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "tqfind") ) + modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "find") ) { setWFlags( WType_TopLevel ); @@ -709,7 +709,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) d = new KEdFindPrivate( page ); TQString text = i18n("Find:"); - TQLabel *label = new TQLabel( text, page , "tqfind" ); + TQLabel *label = new TQLabel( text, page , "find" ); topLayout->addWidget( label ); d->combo->setMinimumWidth(fontMetrics().maxWidth()*20); @@ -813,24 +813,24 @@ class KEdReplace::KEdReplacePrivate public: KEdReplacePrivate( TQWidget *parent ) { searchCombo = new KHistoryCombo( parent, "value" ); - tqreplaceCombo = new KHistoryCombo( parent, "tqreplace_value" ); + replaceCombo = new KHistoryCombo( parent, "replace_value" ); searchCombo->setMaxCount( 20 ); // just some defaults - tqreplaceCombo->setMaxCount( 20 ); + replaceCombo->setMaxCount( 20 ); } ~KEdReplacePrivate() { delete searchCombo; - delete tqreplaceCombo; + delete replaceCombo; } - KHistoryCombo *searchCombo, *tqreplaceCombo; + KHistoryCombo *searchCombo, *replaceCombo; }; KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) :KDialogBase( parent, name, modal, i18n("Replace"), modal ? User3|User2|User1|Cancel : User3|User2|User1|Close, User3, false, - i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "tqfind") ) + i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "find") ) { setWFlags( WType_TopLevel ); @@ -842,7 +842,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) d = new KEdReplacePrivate( page ); TQString text = i18n("Find:"); - TQLabel *label = new TQLabel( text, page, "tqfind" ); + TQLabel *label = new TQLabel( text, page, "find" ); topLayout->addWidget( label ); d->searchCombo->setMinimumWidth(fontMetrics().maxWidth()*20); @@ -850,11 +850,11 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) topLayout->addWidget(d->searchCombo); text = i18n("Replace with:"); - label = new TQLabel( text, page, "tqreplace" ); + label = new TQLabel( text, page, "replace" ); topLayout->addWidget( label ); - d->tqreplaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20); - topLayout->addWidget(d->tqreplaceCombo); + d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20); + topLayout->addWidget(d->replaceCombo); connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )), this,TQT_SLOT(textSearchChanged ( const TQString & ))); @@ -892,7 +892,7 @@ void KEdReplace::slotCancel( void ) { emit done(); d->searchCombo->clearEdit(); - d->tqreplaceCombo->clearEdit(); + d->replaceCombo->clearEdit(); KDialogBase::slotCancel(); } @@ -905,8 +905,8 @@ void KEdReplace::slotUser1( void ) { if( !d->searchCombo->currentText().isEmpty() ) { - d->tqreplaceCombo->addToHistory( d->tqreplaceCombo->currentText() ); - emit tqreplaceAll(); + d->replaceCombo->addToHistory( d->replaceCombo->currentText() ); + emit replaceAll(); } } @@ -915,8 +915,8 @@ void KEdReplace::slotUser2( void ) { if( !d->searchCombo->currentText().isEmpty() ) { - d->tqreplaceCombo->addToHistory( d->tqreplaceCombo->currentText() ); - emit tqreplace(); + d->replaceCombo->addToHistory( d->replaceCombo->currentText() ); + emit replace(); } } @@ -925,7 +925,7 @@ void KEdReplace::slotUser3( void ) if( !d->searchCombo->currentText().isEmpty() ) { d->searchCombo->addToHistory( d->searchCombo->currentText() ); - emit tqfind(); + emit find(); } } @@ -938,7 +938,7 @@ TQString KEdReplace::getText() TQString KEdReplace::getReplaceText() { - return d->tqreplaceCombo->currentText(); + return d->replaceCombo->currentText(); } @@ -966,9 +966,9 @@ KHistoryCombo * KEdReplace::searchCombo() const return d->searchCombo; } -KHistoryCombo * KEdReplace::tqreplaceCombo() const +KHistoryCombo * KEdReplace::replaceCombo() const { - return d->tqreplaceCombo; + return d->replaceCombo; } @@ -1034,7 +1034,7 @@ void KEdit::misspelling (const TQString &word, const TQStringList &, unsigned in void KEdit::corrected (const TQString &originalword, const TQString &newword, unsigned int pos) { //we'll reselect the original word in case the user has played with - //the selection in eframe or the word was auto-tqreplaced + //the selection in eframe or the word was auto-replaced unsigned int l = 0; unsigned int cnt = 0; diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp index b28b1ab00..b58244e93 100644 --- a/kdeui/keditlistbox.cpp +++ b/kdeui/keditlistbox.cpp @@ -79,7 +79,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->m_checkAtEntering = checkAtEntering; servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQGridLayout * grid = new TQGridLayout(this, 7, 2, @@ -119,7 +119,7 @@ void KEditListBox::setButtons( uint buttons ) if ( d->buttons == buttons ) return; - TQGridLayout* grid = static_cast( tqlayout() ); + TQGridLayout* grid = static_cast( layout() ); if ( ( buttons & Add ) && !servNewButton ) { servNewButton = new TQPushButton(i18n("&Add"), this); servNewButton->setEnabled(false); @@ -195,7 +195,7 @@ void KEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (!m_listBox->tqfindItem( text, mode )); + bool enable = (!m_listBox->findItem( text, mode )); servNewButton->setEnabled( enable ); } } @@ -266,7 +266,7 @@ void KEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) ); + alreadyInList =(m_listBox->findItem(currentTextLE, mode) ); } } diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp index be33ac923..2d01dc469 100644 --- a/kdeui/kedittoolbar.cpp +++ b/kdeui/kedittoolbar.cpp @@ -155,7 +155,7 @@ public: if (!e) return false; - TQByteArray data = e->tqencodedData(TOOLBARITEMMIMETYPE); + TQByteArray data = e->encodedData(TOOLBARITEMMIMETYPE); if ( data.isEmpty() ) return false; @@ -252,7 +252,7 @@ public: /** * Return a list of toolbar elements given a toplevel element */ - ToolbarList tqfindToolbars(TQDomNode n) + ToolbarList findToolbars(TQDomNode n) { static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" ); static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" ); @@ -267,7 +267,7 @@ public: if (elem.tagName() == tagToolbar && elem.attribute( attrNoEdit ) != "true" ) list.append(elem); - list += tqfindToolbars(elem.firstChild()); + list += findToolbars(elem.firstChild()); } return list; @@ -304,7 +304,7 @@ public: /** * Look for a given item in the current toolbar */ - TQDomElement tqfindElementForToolbarItem( const ToolbarItem* item ) const + TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const { static const TQString &attrName = KGlobal::staticQString( "name" ); for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) @@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L; KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file, bool global, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this)) + m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this)) { init(); d->m_global = global; @@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this)) + m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this)) { init(); d->m_factory = factory; @@ -427,7 +427,7 @@ void KEditToolbar::init() connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); enableButtonApply(false); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); s_defaultToolbar = 0L; } @@ -467,7 +467,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); - file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file); + file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); } else { @@ -485,10 +485,10 @@ void KEditToolbar::slotDefault() } else { - int slash = d->m_file.tqfindRev('/')+1; + int slash = d->m_file.findRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, @@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, @@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, @@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::~KEditToolbarWidget() @@ -614,7 +614,7 @@ void KEditToolbarWidget::initNonKPart(KActionCollection *collection, local.m_type = XmlData::Local; local.m_document.setContent(localXML); elem = local.m_document.documentElement().toElement(); - local.m_barList = d->tqfindToolbars(elem); + local.m_barList = d->findToolbars(elem); local.m_actionCollection = collection; d->m_xmlFiles.append(local); @@ -624,7 +624,7 @@ void KEditToolbarWidget::initNonKPart(KActionCollection *collection, merge.m_type = XmlData::Merged; merge.m_document = domDocument(); elem = merge.m_document.documentElement().toElement(); - merge.m_barList = d->tqfindToolbars(elem); + merge.m_barList = d->findToolbars(elem); merge.m_actionCollection = collection; d->m_xmlFiles.append(merge); @@ -662,7 +662,7 @@ void KEditToolbarWidget::initKPart(KXMLGUIFactory* factory) data.m_type = XmlData::Part; data.m_document.setContent( KXMLGUIFactory::readConfigFile( client->xmlFile(), client->instance() ) ); elem = data.m_document.documentElement().toElement(); - data.m_barList = d->tqfindToolbars(elem); + data.m_barList = d->findToolbars(elem); data.m_actionCollection = client->actionCollection(); d->m_xmlFiles.append(data); @@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout() // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); - TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); @@ -853,52 +853,52 @@ void KEditToolbarWidget::setupLayout() connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); - d->m_helpArea->tqsetAlignment( Qt::WordBreak ); + d->m_helpArea->setAlignment( Qt::WordBreak ); - // now start with our tqlayouts - TQVBoxLayout *top_tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + // now start with our layouts + TQVBoxLayout *top_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQVBoxLayout *name_tqlayout = new TQVBoxLayout(KDialog::spacingHint()); - TQHBoxLayout *list_tqlayout = new TQHBoxLayout(KDialog::spacingHint()); + TQVBoxLayout *name_layout = new TQVBoxLayout(KDialog::spacingHint()); + TQHBoxLayout *list_layout = new TQHBoxLayout(KDialog::spacingHint()); - TQVBoxLayout *inactive_tqlayout = new TQVBoxLayout(KDialog::spacingHint()); - TQVBoxLayout *active_tqlayout = new TQVBoxLayout(KDialog::spacingHint()); - TQHBoxLayout *changeIcon_tqlayout = new TQHBoxLayout(KDialog::spacingHint()); + TQVBoxLayout *inactive_layout = new TQVBoxLayout(KDialog::spacingHint()); + TQVBoxLayout *active_layout = new TQVBoxLayout(KDialog::spacingHint()); + TQHBoxLayout *changeIcon_layout = new TQHBoxLayout(KDialog::spacingHint()); - TQGridLayout *button_tqlayout = new TQGridLayout(5, 3, 0); + TQGridLayout *button_layout = new TQGridLayout(5, 3, 0); - name_tqlayout->addWidget(d->m_comboLabel); - name_tqlayout->addWidget(m_toolbarCombo); -// name_tqlayout->addWidget(new_toolbar); -// name_tqlayout->addWidget(del_toolbar); + name_layout->addWidget(d->m_comboLabel); + name_layout->addWidget(m_toolbarCombo); +// name_layout->addWidget(new_toolbar); +// name_layout->addWidget(del_toolbar); - button_tqlayout->setRowStretch( 0, 10 ); - button_tqlayout->addWidget(m_upAction, 1, 1); - button_tqlayout->addWidget(m_removeAction, 2, 0); - button_tqlayout->addWidget(m_insertAction, 2, 2); - button_tqlayout->addWidget(m_downAction, 3, 1); - button_tqlayout->setRowStretch( 4, 10 ); + button_layout->setRowStretch( 0, 10 ); + button_layout->addWidget(m_upAction, 1, 1); + button_layout->addWidget(m_removeAction, 2, 0); + button_layout->addWidget(m_insertAction, 2, 2); + button_layout->addWidget(m_downAction, 3, 1); + button_layout->setRowStretch( 4, 10 ); - inactive_tqlayout->addWidget(inactive_label); - inactive_tqlayout->addWidget(m_inactiveList, 1); + inactive_layout->addWidget(inactive_label); + inactive_layout->addWidget(m_inactiveList, 1); - active_tqlayout->addWidget(active_label); - active_tqlayout->addWidget(m_activeList, 1); - active_tqlayout->addLayout(changeIcon_tqlayout); + active_layout->addWidget(active_label); + active_layout->addWidget(m_activeList, 1); + active_layout->addLayout(changeIcon_layout); - changeIcon_tqlayout->addStretch( 1 ); - changeIcon_tqlayout->addWidget( d->m_changeIcon ); - changeIcon_tqlayout->addStretch( 1 ); + changeIcon_layout->addStretch( 1 ); + changeIcon_layout->addWidget( d->m_changeIcon ); + changeIcon_layout->addStretch( 1 ); - list_tqlayout->addLayout(inactive_tqlayout); - list_tqlayout->addLayout(button_tqlayout); - list_tqlayout->addLayout(active_tqlayout); + list_layout->addLayout(inactive_layout); + list_layout->addLayout(button_layout); + list_layout->addLayout(active_layout); - top_tqlayout->addLayout(name_tqlayout); - top_tqlayout->addWidget(d->m_comboSeparator); - top_tqlayout->addLayout(list_tqlayout,10); - top_tqlayout->addWidget(d->m_helpArea); - top_tqlayout->addWidget(new KSeparator(this)); + top_layout->addLayout(name_layout); + top_layout->addWidget(d->m_comboSeparator); + top_layout->addLayout(list_layout,10); + top_layout->addWidget(d->m_helpArea); + top_layout->addWidget(new KSeparator(this)); } void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) @@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) if (it.tagName() == tagSeparator) { ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null); - bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") ); + bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") ); if(isLineSep) act->setText(1, LINESEPARATORSTRING); else @@ -988,7 +988,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) { // Merge can be named or not - use the name if there is one TQString name = it.attribute( attrName ); - ToolbarItem *act = new ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be tqreplaced with all the elements of an embedded component.")); + ToolbarItem *act = new ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be replaced with all the elements of an embedded component.")); if ( name.isEmpty() ) act->setText(1, i18n("")); else @@ -1034,7 +1034,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) KAction *action = actionCollection->action( i ); // skip our active ones - if (active_list.tqcontains(action->name())) + if (active_list.contains(action->name())) continue; ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip()); @@ -1213,7 +1213,7 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before, // we have the item in the active list which is before the new // item.. so let's try our best to add our new item right after it ToolbarItem *act_item = (ToolbarItem*)before; - TQDomElement elem = d->tqfindElementForToolbarItem( act_item ); + TQDomElement elem = d->findElementForToolbarItem( act_item ); Q_ASSERT( !elem.isNull() ); d->m_currentToolbarElem.insertAfter(new_item, elem); } @@ -1243,8 +1243,8 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item) // we're modified, so let this change emit enableOk(true); - // now iterate through to tqfind the child to nuke - TQDomElement elem = d->tqfindElementForToolbarItem( item ); + // now iterate through to find the child to nuke + TQDomElement elem = d->findElementForToolbarItem( item ); if ( !elem.isNull() ) { // nuke myself! @@ -1275,7 +1275,7 @@ void KEditToolbarWidget::slotUpButton() void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) { - TQDomElement e = d->tqfindElementForToolbarItem( item ); + TQDomElement e = d->findElementForToolbarItem( item ); if ( e.isNull() ) return; @@ -1303,7 +1303,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) if ( !before ) d->m_currentToolbarElem.insertBefore(e, d->m_currentToolbarElem.firstChild() ); else - d->m_currentToolbarElem.insertAfter(e, d->tqfindElementForToolbarItem( (ToolbarItem*)before )); + d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before )); // and set this container as a noMerge static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); @@ -1361,7 +1361,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) continue; TQDomElement toolbar = (*xit).m_document.documentElement().toElement(); - toolbar.tqreplaceChild(elem, (*it)); + toolbar.replaceChild(elem, (*it)); return; } @@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon() return; d->m_kdialogProcess = new KProcIO; - TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); (*d->m_kdialogProcess) << kdialogExe; (*d->m_kdialogProcess) << "--embed"; - (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() ); + (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() ); (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; @@ -1434,7 +1434,7 @@ void KEditToolbarWidget::slotProcessExited( KProcess* ) // Get hold of ActionProperties tag TQDomElement elem = KXMLGUIFactory::actionPropertiesElement( d->m_currentXmlData->m_document ); // Find or create an element for this action - TQDomElement act_elem = KXMLGUIFactory::tqfindActionByName( elem, item->internalName(), true /*create*/ ); + TQDomElement act_elem = KXMLGUIFactory::findActionByName( elem, item->internalName(), true /*create*/ ); Q_ASSERT( !act_elem.isNull() ); act_elem.setAttribute( "icon", icon ); diff --git a/kdeui/kedittoolbar.h b/kdeui/kedittoolbar.h index 4bc6c26b4..9033ff17f 100644 --- a/kdeui/kedittoolbar.h +++ b/kdeui/kedittoolbar.h @@ -43,7 +43,7 @@ namespace * * This dialog only works if your application uses the XML UI * framework for creating menus and toolbars. It depends on the XML - * files to describe the toolbar tqlayouts and it requires the actions + * files to describe the toolbar layouts and it requires the actions * to determine which buttons are active. * * Typically, you would include the KStdAction::configureToolbars() @@ -83,7 +83,7 @@ namespace * Note that the procedure is a bit different for KParts applications. * In this case, you need only pass along a pointer to your * application's KXMLGUIFactory object. The editor will take care of - * tqfinding all of the action collections and XML files. The editor + * finding all of the action collections and XML files. The editor * aims to be semi-intelligent about where it assigns any * modifications. In other words, it will not write out part specific * changes to your shell's XML file. @@ -164,7 +164,7 @@ public: * Constructor for KParts based apps. * * The main parameter, factory(), is a pointer to the - * XML GUI factory object for your application. It tqcontains a list + * XML GUI factory object for your application. It contains a list * of all of the GUI clients (along with the action collections and * xml files) and the toolbar editor uses that. * @@ -261,7 +261,7 @@ private: * * This widget only works if your application uses the XML UI * framework for creating menus and toolbars. It depends on the XML - * files to describe the toolbar tqlayouts and it requires the actions + * files to describe the toolbar layouts and it requires the actions * to determine which buttons are active. * * @author Kurt Granroth @@ -325,7 +325,7 @@ public: * Constructor for KParts based apps. * * The first parameter, factory, is a pointer to the XML GUI - * factory object for your application. It tqcontains a list of all + * factory object for your application. It contains a list of all * of the GUI clients (along with the action collections and xml * files) and the toolbar editor uses that. * diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp index cd4c92b43..c664d226e 100644 --- a/kdeui/kfontcombo.cpp +++ b/kdeui/kfontcombo.cpp @@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p) if (m_canPaintName) p->setFont(*m_font); else - t = TQString::tqfromLatin1("(%1)").arg(m_fontName); + t = TQString::fromLatin1("(%1)").arg(m_fontName); } TQFontMetrics fm(p->fontMetrics()); p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t); @@ -212,7 +212,7 @@ void KFontCombo::setCurrentFont(const TQString &family) return; } } - int x = lowerName.tqfind(" ["); + int x = lowerName.find(" ["); if (x>-1) { lowerName = lowerName.left(x); @@ -251,7 +251,7 @@ void KFontCombo::setCurrentFont(const TQString &family) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); + realFamily.remove(realFamily.find(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setCurrentFont( realFamily ); diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index 0b0193981..4044c7b68 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -284,7 +284,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -292,10 +292,10 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, sampleEdit = new TQLineEdit( page, "sampleEdit"); TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); sampleEdit->setFont(tmpFont); - //i18n: This is a classical test phrase. (It tqcontains all letters from A to Z.) + //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->tqsetAlignment(Qt::AlignCenter); + sampleEdit->setAlignment(Qt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser::~KFontChooser() @@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser::tqsizeHint( void ) const +TQSize KFontChooser::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -469,13 +469,13 @@ void KFontChooser::family_chosen_slot(const TQString& family) currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString style = *it; - int pos = style.tqfind("Plain"); - if(pos >=0) style = style.tqreplace(pos,5,i18n("Regular")); - pos = style.tqfind("Normal"); - if(pos >=0) style = style.tqreplace(pos,6,i18n("Regular")); - pos = style.tqfind("Oblique"); - if(pos >=0) style = style.tqreplace(pos,7,i18n("Italic")); - if(!styleListBox->tqfindItem(style)) { + int pos = style.find("Plain"); + if(pos >=0) style = style.replace(pos,5,i18n("Regular")); + pos = style.find("Normal"); + if(pos >=0) style = style.replace(pos,6,i18n("Regular")); + pos = style.find("Oblique"); + if(pos >=0) style = style.replace(pos,7,i18n("Italic")); + if(!styleListBox->findItem(style)) { styleListBox->insertItem(i18n(style.utf8())); currentStyles.insert(i18n(style.utf8()), *it); } @@ -486,9 +486,9 @@ void KFontChooser::family_chosen_slot(const TQString& family) } styleListBox->blockSignals(true); - TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle); + TQListBoxItem *item = styleListBox->findItem(selectedStyle); if (item) - styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true); + styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); @@ -538,7 +538,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -585,9 +585,9 @@ void KFontChooser::setupDisplay() // 1st Fallback if ( (i == numEntries) ) { - if (family.tqcontains('[')) + if (family.contains('[')) { - family = family.left(family.tqfind('[')).stripWhiteSpace(); + family = family.left(family.find('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) { familyListBox->setCurrentItem(i); @@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::tqfromLatin1(ptr + 1); + TQString font = TQString::fromLatin1(ptr + 1); int pos; - if ( ( pos = font.tqfind( '-' ) ) > 0 ) { + if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); @@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show) { if( show ) { - xlfdEdit->tqparentWidget()->show(); + xlfdEdit->parentWidget()->show(); } else { - xlfdEdit->tqparentWidget()->hide(); + xlfdEdit->parentWidget()->hide(); } } diff --git a/kdeui/kfontdialog.h b/kdeui/kfontdialog.h index 7eea713b7..266090c37 100644 --- a/kdeui/kfontdialog.h +++ b/kdeui/kfontdialog.h @@ -139,7 +139,7 @@ public: void setFont( const TQFont &font, bool onlyFixed = false ); /** - * @return The bittqmask corresponding to the attributes the user + * @return The bitmask corresponding to the attributes the user * wishes to change. */ int fontDiffFlags(); @@ -252,7 +252,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: /** @@ -431,8 +431,8 @@ public: * @param theFont a reference to the font to write the chosen font * into. * @param diffFlags a reference to the int into which the chosen - * difference selection bittqmask should be written. - * Check the returned bittqmask like: + * difference selection bitmask should be written. + * Check the returned bitmask like: * \code * if ( diffFlags & KFontChooser::FontDiffFamily ) * [...] diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp index 13b3ffbcf..293f9d546 100644 --- a/kdeui/kfontrequester.cpp +++ b/kdeui/kfontrequester.cpp @@ -32,7 +32,7 @@ KFontRequester::KFontRequester( TQWidget *parent, const char *name, bool onlyFixed ) : TQWidget( parent, name ), m_onlyFixed( onlyFixed ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); m_sampleLabel = new TQLabel( this, "m_sampleLabel" ); m_button = new TQPushButton( i18n( "Choose..." ), this, "m_button" ); @@ -40,8 +40,8 @@ KFontRequester::KFontRequester( TQWidget *parent, const char *name, m_sampleLabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setFocusProxy( m_button ); - tqlayout->addWidget( m_sampleLabel, 1 ); - tqlayout->addWidget( m_button ); + layout->addWidget( m_sampleLabel, 1 ); + layout->addWidget( m_button ); connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) ); @@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title ) void KFontRequester::buttonClicked() { - int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() ); + int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() ); if ( result == KDialog::Accepted ) { diff --git a/kdeui/kguiitem.cpp b/kdeui/kguiitem.cpp index abcc3868a..7b73c7401 100644 --- a/kdeui/kguiitem.cpp +++ b/kdeui/kguiitem.cpp @@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const int resultLength = 0; stripped.setLength(len); - const TQChar* data = d->m_text.tqunicode(); + const TQChar* data = d->m_text.unicode(); for ( int pos = 0; pos < len; ++pos ) { if ( data[ pos ] != '&' ) diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp index 20be799b6..c6557f044 100644 --- a/kdeui/khelpmenu.cpp +++ b/kdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // compatible. // const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); - TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name()); + TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(qApp->name()); mMenu = new KPopupMenu(); connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); @@ -306,7 +306,7 @@ void KHelpMenu::contextHelpActivated() TQWhatsThis::enterWhatsThisMode(); TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) - w = w->tqparentWidget(); + w = w->parentWidget(); #ifdef Q_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); diff --git a/kdeui/khelpmenu.h b/kdeui/khelpmenu.h index 331ef0875..fdece6510 100644 --- a/kdeui/khelpmenu.h +++ b/kdeui/khelpmenu.h @@ -128,7 +128,7 @@ class KHelpMenuPrivate; * @author Espen Sand (espen@kde.org) */ -class KDEUI_EXPORT KHelpMenu : public TQObject +class KDEUI_EXPORT KHelpMenu : public QObject { Q_OBJECT diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp index 102fb3cc4..13b6183ad 100644 --- a/kdeui/kiconview.cpp +++ b/kdeui/kiconview.cpp @@ -49,7 +49,7 @@ public: KIconView::Mode mode; bool doAutoSelect; TQFontMetrics *fm; - TQPixmapCache tqmaskCache; + TQPixmapCache maskCache; int textHeight; TQIconViewItem *dragHoldItem; TQTimer dragHoldTimer; @@ -186,7 +186,7 @@ void KIconView::slotAutoSelect() bool update = viewport()->isUpdatesEnabled(); viewport()->setUpdatesEnabled( false ); - //Calculate the smallest rectangle that tqcontains the current Item + //Calculate the smallest rectangle that contains the current Item //and the one that got the autoselect event TQRect r; TQRect redraw; @@ -217,7 +217,7 @@ void KIconView::slotAutoSelect() blockSignals( block ); viewport()->setUpdatesEnabled( update ); - tqrepaintContents( redraw, false ); + repaintContents( redraw, false ); emit selectionChanged(); @@ -258,7 +258,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) void KIconView::updateDragHoldItem( TQDropEvent *e ) { - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); if ( d->dragHoldItem != item) { @@ -307,7 +307,7 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQIconView::contentsMouseDoubleClickEvent( e ); - TQIconViewItem* item = tqfindItem( e->pos() ); + TQIconViewItem* item = findItem( e->pos() ); if( item ) { if( (e->button() == LeftButton) && !m_bUseSingle ) @@ -417,10 +417,10 @@ TQFontMetrics *KIconView::itemFontMetrics() const TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const { TQPixmap m; - if ( d->tqmaskCache.tqfind( TQString::number( pix->serialNumber() ), m ) ) + if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) ) return m; m = KPixmapEffect::selectedPixmap( KPixmap(*pix), col ); - d->tqmaskCache.insert( TQString::number( pix->serialNumber() ), m ); + d->maskCache.insert( TQString::number( pix->serialNumber() ), m ); return m; } @@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ ) KIconView *view = static_cast(iconView()); TQRect itemIconRect = pixmapRect(); TQRect itemTextRect = textRect(); - TQRect tqitemRect = rect(); + TQRect itemRect = rect(); int pw = 0; int ph = 0; @@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ ) itemIconRect.setWidth( pw ); #if 1 // FIXME // There is a bug in Qt which prevents the item from being placed - // properly when the pixmapRect is not at the top of the tqitemRect, so we + // properly when the pixmapRect is not at the top of the itemRect, so we // have to increase the height of the pixmapRect and leave it at the top - // of the tqitemRect... + // of the itemRect... if ( d && !d->m_pixmapSize.isNull() ) itemIconRect.setHeight( d->m_pixmapSize.height() + 2 ); else @@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = itemTextRect.height() + itemIconRect.height() + 1; } - tqitemRect.setWidth( w ); - tqitemRect.setHeight( h ); + itemRect.setWidth( w ); + itemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(), @@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = QMAX( itemTextRect.height(), itemIconRect.height() ); w = itemTextRect.width() + itemIconRect.width() + 1; - tqitemRect.setWidth( w ); - tqitemRect.setHeight( h ); + itemRect.setWidth( w ); + itemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() @@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) setPixmapRect( itemIconRect ); if ( itemTextRect != textRect() ) setTextRect( itemTextRect ); - if ( tqitemRect != rect() ) - setItemRect( tqitemRect ); + if ( itemRect != rect() ) + setItemRect( itemRect ); // Done by setPixmapRect, setTextRect and setItemRect ! [and useless if no rect changed] //view->updateItemContainer( this ); @@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) #if 1 // FIXME // Move the pixmap manually because the pixmapRect is at the - // top of the tqitemRect + // top of the itemRect // (won't be needed anymore in future versions of qt) if ( d && !d->m_pixmapSize.isNull() ) { diff --git a/kdeui/kiconview.h b/kdeui/kiconview.h index 0f6096ac9..0b0c49515 100644 --- a/kdeui/kiconview.h +++ b/kdeui/kiconview.h @@ -247,10 +247,10 @@ public: /** * Using this function, you can specify a custom size for the pixmap. The - * tqgeometry of the item will be calculated to let a pixmap of the given size + * geometry of the item will be calculated to let a pixmap of the given size * fit in the iconView without needing an update. * This may be useful if you want to change the pixmap later without breaking - * the tqlayout. A possible use of this function is to tqreplace a fileItem icon + * the layout. A possible use of this function is to replace a fileItem icon * by a larger pixmap (preview). * @since 3.3 * diff --git a/kdeui/kiconviewsearchline.cpp b/kdeui/kiconviewsearchline.cpp index 1ee76c9df..701e15428 100644 --- a/kdeui/kiconviewsearchline.cpp +++ b/kdeui/kiconviewsearchline.cpp @@ -224,7 +224,7 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, return false; TQString itemtext = item->text(); - return ( itemtext.tqfind( s, 0, caseSensitive() ) >= 0 ); + return ( itemtext.find( s, 0, caseSensitive() ) >= 0 ); } void KIconViewSearchLine::init( TQIconView *iconView ) diff --git a/kdeui/kinputdialog.cpp b/kdeui/kinputdialog.cpp index af88b922e..37f94e89e 100644 --- a/kdeui/kinputdialog.cpp +++ b/kdeui/kinputdialog.cpp @@ -52,30 +52,30 @@ KInputDialogPrivate::KInputDialogPrivate() KInputDialog::KInputDialog( const TQString &caption, const TQString &label, const TQString &value, TQWidget *parent, const char *name, - TQValidator *validator, const TQString &tqmask ) + TQValidator *validator, const TQString &mask ) : KDialogBase( parent, name, true, caption, Ok|Cancel|User1, Ok, true, KStdGuiItem::clear() ), d( new KInputDialogPrivate() ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); d->m_lineEdit = new KLineEdit( value, frame ); - tqlayout->addWidget( d->m_lineEdit ); + layout->addWidget( d->m_lineEdit ); d->m_lineEdit->setFocus(); d->m_label->setBuddy( d->m_lineEdit ); - tqlayout->addStretch(); + layout->addStretch(); if ( validator ) d->m_lineEdit->setValidator( validator ); - if ( !tqmask.isEmpty() ) - d->m_lineEdit->setInputMask( tqmask ); + if ( !mask.isEmpty() ) + d->m_lineEdit->setInputMask( mask ); connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); @@ -92,15 +92,15 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d( new KInputDialogPrivate() ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); d->m_textEdit = new KTextEdit( frame ); d->m_textEdit->setTextFormat( PlainText ); d->m_textEdit->setText( value ); - tqlayout->addWidget( d->m_textEdit, 10 ); + layout->addWidget( d->m_textEdit, 10 ); d->m_textEdit->setFocus(); d->m_label->setBuddy( d->m_textEdit ); @@ -117,16 +117,16 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d( new KInputDialogPrivate() ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); d->m_intSpinBox = new KIntSpinBox( minValue, maxValue, step, value, base, frame ); - tqlayout->addWidget( d->m_intSpinBox ); + layout->addWidget( d->m_intSpinBox ); - tqlayout->addStretch(); + layout->addStretch(); d->m_intSpinBox->setFocus(); setMinimumWidth( 300 ); @@ -139,16 +139,16 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d( new KInputDialogPrivate() ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); d->m_doubleSpinBox = new KDoubleSpinBox( minValue, maxValue, step, value, decimals, frame ); - tqlayout->addWidget( d->m_doubleSpinBox ); + layout->addWidget( d->m_doubleSpinBox ); - tqlayout->addStretch(); + layout->addStretch(); d->m_doubleSpinBox->setFocus(); setMinimumWidth( 300 ); @@ -164,17 +164,17 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, showButton( User1, editable ); TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); if ( editable ) { d->m_comboBox = new KComboBox( editable, frame ); d->m_comboBox->insertStringList( list ); d->m_comboBox->setCurrentItem( current ); - tqlayout->addWidget( d->m_comboBox ); + layout->addWidget( d->m_comboBox ); connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateButtons( const TQString & ) ) ); @@ -187,7 +187,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->insertStringList( list ); d->m_listBox->setSelected( current, true ); d->m_listBox->ensureCurrentVisible(); - tqlayout->addWidget( d->m_listBox, 10 ); + layout->addWidget( d->m_listBox, 10 ); connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), @@ -196,7 +196,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->setFocus(); } - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } @@ -208,14 +208,14 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d( new KInputDialogPrivate() ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); d->m_label = new TQLabel( label, frame ); - tqlayout->addWidget( d->m_label ); + layout->addWidget( d->m_label ); d->m_listBox = new KListBox( frame ); d->m_listBox->insertStringList( list ); - tqlayout->addWidget( d->m_listBox ); + layout->addWidget( d->m_listBox ); TQListBoxItem *item; @@ -225,7 +225,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, for ( TQStringList::ConstIterator it=select.begin(); it!=select.end(); ++it ) { - item = d->m_listBox->tqfindItem( *it, CaseSensitive|ExactMatch ); + item = d->m_listBox->findItem( *it, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } @@ -238,7 +238,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, TQT_SLOT( slotOk() ) ); TQString text = select.first(); - item = d->m_listBox->tqfindItem( text, CaseSensitive|ExactMatch ); + item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } @@ -246,7 +246,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->ensureCurrentVisible(); d->m_listBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } @@ -258,18 +258,18 @@ KInputDialog::~KInputDialog() TQString KInputDialog::getText( const TQString &caption, const TQString &label, const TQString &value, bool *ok, TQWidget *parent, const char *name, - TQValidator *validator, const TQString &tqmask ) + TQValidator *validator, const TQString &mask ) { - return text( caption, label, value, ok, parent, name, validator, tqmask, + return text( caption, label, value, ok, parent, name, validator, mask, TQString::null ); } TQString KInputDialog::text( const TQString &caption, const TQString &label, const TQString &value, bool *ok, TQWidget *parent, - const char *name, TQValidator *validator, const TQString &tqmask, + const char *name, TQValidator *validator, const TQString &mask, const TQString &whatsThis ) { - KInputDialog dlg( caption, label, value, parent, name, validator, tqmask ); + KInputDialog dlg( caption, label, value, parent, name, validator, mask ); if( !whatsThis.isEmpty() ) TQWhatsThis::add( dlg.lineEdit(), whatsThis ); diff --git a/kdeui/kinputdialog.h b/kdeui/kinputdialog.h index 3228545a0..c675a280c 100644 --- a/kdeui/kinputdialog.h +++ b/kdeui/kinputdialog.h @@ -57,7 +57,7 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase */ KInputDialog( const TQString &caption, const TQString &label, const TQString &value, TQWidget *parent, const char *name, - TQValidator *validator, const TQString &tqmask ); + TQValidator *validator, const TQString &mask ); KInputDialog( const TQString &caption, const TQString &label, const TQString &value, TQWidget *parent, const char *name ); KInputDialog( const TQString &caption, const TQString &label, int value, @@ -111,15 +111,15 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase * @param parent Parent of the dialog widget * @param name Name of the dialog widget * @param validator A @ref TQValidator to be associated with the line edit - * @param tqmask Mask associated with the line edit. See the - * documentation for @ref TQLineEdit about tqmasks. + * @param mask Mask associated with the line edit. See the + * documentation for @ref TQLineEdit about masks. * * @return String user entered if Ok was pressed, else a null string */ static TQString getText( const TQString &caption, const TQString &label, const TQString &value=TQString::null, bool *ok=0, TQWidget *parent=0, const char *name=0, TQValidator *validator=0, - const TQString &tqmask=TQString::null ); + const TQString &mask=TQString::null ); /** * Same as @ref getText except it provides an extra parameter to specify @@ -132,7 +132,7 @@ class KDEUI_EXPORT KInputDialog : public KDialogBase static TQString text( const TQString &caption, const TQString &label, const TQString &value=TQString::null, bool *ok=0, TQWidget *parent=0, const char *name=0, TQValidator *validator=0, - const TQString &tqmask=TQString::null, + const TQString &mask=TQString::null, const TQString& whatsThis=TQString::null ); /** diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 865aea170..4fb398395 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -373,7 +373,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap } // Now search for a child with the current Name, and if it we doesn't - // tqfind it, then remember the location of the last child. + // find it, then remember the location of the last child. for (last = 0; child && child->text(0) != name ; last = child, child = child->nextSibling()); if (!last && !child) { @@ -397,7 +397,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap } } else { - // the node had some children, but we didn't tqfind the given name + // the node had some children, but we didn't find the given name if (isTop) newChild = new TQListViewItem(mTreeList, last, name); else @@ -413,7 +413,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap curPath << name; TQString key = curPath.join("_/_"); - if (mFolderIconMap.tqcontains(key)) { + if (mFolderIconMap.contains(key)) { TQPixmap p = mFolderIconMap[key]; newChild->setPixmap(0,p); } @@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, TQString itemName = items.last(); IconListItem *item = new IconListItem( mIconList, pixmap, itemName ); mIconListToPageStack.insert(item, page); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); if (mIconList->isVisible()) mIconList->updateWidth(); @@ -506,9 +506,9 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } // - // Remove current tqlayout and make a new. + // Remove current layout and make a new. // - delete mSwallowPage->tqlayout(); + delete mSwallowPage->layout(); TQGridLayout *gbox = new TQGridLayout( mSwallowPage, 1, 1, 0 ); @@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } gbox->addWidget(widget, 0, 0 ); gbox->activate(); - mSwallowPage->setMinimumSize( widget->tqminimumSize() ); + mSwallowPage->setMinimumSize( widget->minimumSize() ); } return true; @@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // if( widget->isA("TQFrame") ) { - return d->mPageToInt[widget->tqparentWidget()]; + return d->mPageToInt[widget->parentWidget()]; } else { @@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged() TQFont listFont( mIconList->font() ); listFont.setBold( true ); mIconList->setFont( listFont ); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); } } @@ -758,31 +758,31 @@ void KJanusWidget::setFocus() } -TQSize KJanusWidget::tqminimumSizeHint() const +TQSize KJanusWidget::minimumSizeHint() const { if( mFace == TreeList || mFace == IconList ) { TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 ); TQSize s2(0,0); TQSize s3(0,0); - TQSize s4( mPageStack->tqsizeHint() ); + TQSize s4( mPageStack->sizeHint() ); if( mFace == TreeList ) { - s1.rwidth() += style().tqpixelMetric( TQStyle::PM_SplitterWidth ); - s2 = mTreeList->tqminimumSize(); + s1.rwidth() += style().pixelMetric( TQStyle::PM_SplitterWidth ); + s2 = mTreeList->minimumSize(); } else { mIconList->updateMinimumHeight(); mIconList->updateWidth(); - s2 = mIconList->tqminimumSize(); + s2 = mIconList->minimumSize(); } if( mTitleLabel->isVisible() ) { - s3 += mTitleLabel->tqsizeHint(); - s3.rheight() += mTitleSep->tqminimumSize().height(); + s3 += mTitleLabel->sizeHint(); + s3.rheight() += mTitleSep->minimumSize().height(); } // @@ -795,15 +795,15 @@ TQSize KJanusWidget::tqminimumSizeHint() const } else if( mFace == Tabbed ) { - return mTabControl->tqsizeHint(); + return mTabControl->sizeHint(); } else if( mFace == Swallow ) { - return mSwallowPage->tqminimumSize(); + return mSwallowPage->minimumSize(); } else if( mFace == Plain ) { - return mPlainPage->tqsizeHint(); + return mPlainPage->sizeHint(); } else { @@ -813,9 +813,9 @@ TQSize KJanusWidget::tqminimumSizeHint() const } -TQSize KJanusWidget::tqsizeHint() const +TQSize KJanusWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e ) if( item ) { int lw = item->width( mIconList ); - int sw = mIconList->verticalScrollBar()->tqsizeHint().width(); + int sw = mIconList->verticalScrollBar()->sizeHint().width(); mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 ); } } @@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth() if( verticalScrollBar()->isVisible() ) { - maxWidth += verticalScrollBar()->tqsizeHint().width(); + maxWidth += verticalScrollBar()->sizeHint().width(); } setFixedWidth( maxWidth + frameWidth()*2 ); @@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth() } -void KJanusWidget::IconListBox::tqinvalidateHeight() +void KJanusWidget::IconListBox::invalidateHeight() { mHeightValid = false; } -void KJanusWidget::IconListBox::tqinvalidateWidth() +void KJanusWidget::IconListBox::invalidateWidth() { mWidthValid = false; } @@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase ) // For now, always disable highlighting erase = true; - TQRect r = listBox()->tqitemRect( this ); + TQRect r = listBox()->itemRect( this ); r.addCoords( 1, 1, -1, -1 ); TQPainter p( listBox()->viewport() ); p.setClipRegion( r ); - const TQColorGroup &cg = listBox()->tqcolorGroup(); + const TQColorGroup &cg = listBox()->colorGroup(); if ( erase ) { p.setPen( cg.base() ); @@ -1114,14 +1114,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); - TQBitmap tqmask( pix->width(), pix->height(), true ); - tqmask.fill( Qt::black ); - p.begin( &tqmask ); + TQBitmap mask( pix->width(), pix->height(), true ); + mask.fill( Qt::black ); + p.begin( &mask ); p.setPen( Qt::white ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); - pix->setMask( tqmask ); + pix->setMask( mask ); } return *pix; } @@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() void KJanusWidget::IconListItem::paint( TQPainter *painter ) { - TQRect itemPaintRegion( listBox()->tqitemRect( this ) ); + TQRect itemPaintRegion( listBox()->itemRect( this ) ); TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2); if ( isSelected() ) @@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) painter->eraseRect( r ); painter->save(); - painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) ); + painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) ); painter->drawRect( r ); painter->restore(); } @@ -1191,7 +1191,7 @@ void KJanusWidget::virtual_hook( int, void* ) // delete the node. void KJanusWidget::removePage( TQWidget *page ) { - if (!d || !d->mPageToInt.tqcontains(page)) + if (!d || !d->mPageToInt.contains(page)) return; int index = d->mPageToInt[page]; @@ -1237,7 +1237,7 @@ void KJanusWidget::removePage( TQWidget *page ) TQString KJanusWidget::pageTitle(int index) const { - if (!d || !d->mIntToTitle.tqcontains(index)) + if (!d || !d->mIntToTitle.contains(index)) return TQString::null; else return d->mIntToTitle[index]; @@ -1246,7 +1246,7 @@ TQString KJanusWidget::pageTitle(int index) const TQWidget *KJanusWidget::pageWidget(int index) const { - if (!d || !d->mIntToPage.tqcontains(index)) + if (!d || !d->mIntToPage.contains(index)) return 0; else return d->mIntToPage[index]; diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h index 94c50e5c6..cc22dc334 100644 --- a/kdeui/kjanuswidget.h +++ b/kdeui/kjanuswidget.h @@ -41,21 +41,21 @@ class TQListViewItem; class KGuiItem; /** - * @short Easy to use widget with many tqlayouts + * @short Easy to use widget with many layouts * - * Provides a number of ready to use tqlayouts (faces). It is used + * Provides a number of ready to use layouts (faces). It is used * as an internal widget in KDialogBase, but can also used as a * widget of its own. * * This class provides KJanusWidget::TreeList, KJanusWidget::IconList, - * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow tqlayouts. + * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts. * - * For all modes it is important that you specify the TQWidget::tqminimumSize() + * For all modes it is important that you specify the TQWidget::minimumSize() * on the page, plain widget or the swallowed widget. If you use a QLayout * on the page, plain widget or the swallowed widget this will be taken care * of automatically. The size is used when the KJanusWidget determines its * own minimum size. You get the minimum size by using the - * tqminimumSizeHint() or tqsizeHint() methods. + * minimumSizeHint() or sizeHint() methods. * * Pages that have been added in TreeList, IconList or Tabbed mode can be * removed by simply deleting the page. However, it would be preferable to use @@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public QWidget IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 ); void updateMinimumHeight(); void updateWidth(); - void tqinvalidateHeight(); - void tqinvalidateWidth(); + void invalidateHeight(); + void invalidateWidth(); void setShowAll( bool showAll ); protected: @@ -98,7 +98,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget /** * The TreeList face provides a list in the left area and pages in the * right. The area are separated by a movable splitter. The style is somewhat - * similar to the tqlayout in the Control Center. A page is raised by + * similar to the layout in the Control Center. A page is raised by * selecting the corresponding tree list item. */ TreeList = 0, @@ -106,7 +106,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * page is similar for creating a TreeList. This has the advantage that if * your widget contain too many pages it is trivial to convert it into a * TreeList. Just change the face in the KJanusWidget constructor to - * KJanusWidget::TreeList and you have a tree list tqlayout instead. + * KJanusWidget::TreeList and you have a tree list layout instead. */ Tabbed, /** @@ -126,7 +126,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget /** * The IconList face provides an icon list in the left area and pages in the * right. For each entry the Icon is on top with the text below. The style - * is somewhat similar to the tqlayout of the Eudora configuation dialog box. + * is somewhat similar to the layout of the Eudora configuation dialog box. * A page is raised by selecting the corresponding icon list item. The * preferred icon size is 32x32 pixels. */ @@ -186,7 +186,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The minimum size. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Returns the recommended size for the widget in order to be displayed @@ -194,7 +194,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The recommended size. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Returns the empty widget that is available in Plain mode. @@ -206,7 +206,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget /** * Add a new page when the class is used in TreeList, IconList or Tabbed * mode. The returned widget is empty and you must add your widgets - * as children to this widget. In most cases you must create a tqlayout + * as children to this widget. In most cases you must create a layout * manager and associate it with this widget as well. * * Deleting the returned frame will cause the listitem or tab to be @@ -246,7 +246,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * Add a new page when the class is used in TreeList, IconList or Tabbed * mode. The returned widget is empty and you must add your widgets * as children to this widget. The returned widget is a QVBox - * so it tqcontains a TQVBoxLayout tqlayout that lines up the child widgets + * so it contains a TQVBoxLayout layout that lines up the child widgets * are vertically. * * Deleting the returned frame will cause the listitem or tab to be @@ -285,7 +285,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * Add a new page when the class is used in TreeList, IconList or Tabbed * mode. The returned widget is empty and you must add your widgets * as children to this widget. The returned widget is a QHBox - * so it tqcontains a TQHBoxLayout tqlayout that lines up the child widgets + * so it contains a TQHBoxLayout layout that lines up the child widgets * are horizontally. * * Deleting the returned frame will cause the listitem or tab to be @@ -325,7 +325,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * Add a new page when the class is used in either TreeList or Tabbed * mode. The returned widget is empty and you must add your widgets * as children to this widget. The returned widget is a QGrid - * so it tqcontains a TQGridLayout tqlayout that places up the child widgets + * so it contains a TQGridLayout layout that places up the child widgets * in a grid. * * Deleting the returned frame will cause the listitem or tab to be diff --git a/kdeui/kkeybutton.cpp b/kdeui/kkeybutton.cpp index 5ac9dd360..581d7bf40 100644 --- a/kdeui/kkeybutton.cpp +++ b/kdeui/kkeybutton.cpp @@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut ) d->bQtShortcut = bQtShortcut; m_cut = cut; TQString keyStr = m_cut.toString(); - keyStr.tqreplace('&', TQString::tqfromLatin1("&&")); + keyStr.replace('&', TQString::fromLatin1("&&")); setText( keyStr.isEmpty() ? i18n("None") : keyStr ); } @@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut ) void KKeyButton::setText( const TQString& text ) { TQPushButton::setText( text ); - setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 ); + setFixedSize( sizeHint().width()+12, sizeHint().height()+8 ); } void KKeyButton::captureShortcut() @@ -106,7 +106,7 @@ void KKeyButton::captureShortcut() KShortcut cut; m_bEditing = true; - tqrepaint(); + repaint(); { KShortcutDialog dlg( m_cut, d->bQtShortcut, this ); @@ -117,7 +117,7 @@ void KKeyButton::captureShortcut() emit capturedShortcut( cut ); m_bEditing = false; - tqrepaint(); + repaint(); } void KKeyButton::drawButton( TQPainter *painter ) @@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter ) painter->setClipping( false ); if( width() > 12 && height() > 8 ) qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8, - tqcolorGroup(), true, 1, 0L ); + colorGroup(), true, 1, 0L ); if ( m_bEditing ) { - painter->setPen( tqcolorGroup().base() ); - painter->setBrush( tqcolorGroup().base() ); + painter->setPen( colorGroup().base() ); + painter->setBrush( colorGroup().base() ); } else { @@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter ) drawButtonLabel( painter ); - painter->setPen( tqcolorGroup().text() ); + painter->setPen( colorGroup().text() ); painter->setBrush( NoBrush ); if( hasFocus() || m_bEditing ) { diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp index bb228895e..13835b650 100644 --- a/kdeui/kkeydialog.cpp +++ b/kdeui/kkeydialog.cpp @@ -301,7 +301,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) // // TOP LAYOUT MANAGER // - // The following tqlayout is used for the dialog + // The following layout is used for the dialog // LIST LABELS LAYOUT // SPLIT LIST BOX WIDGET // CHOOSE KEY GROUP BOX WIDGET @@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) ); - grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 ); + grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " "you can press the key-combination which you would like to be assigned " @@ -431,7 +431,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) TQWhatsThis::add( d->pbtnShortcut, wtstr ); // - // Add widgets to the tqgeometry manager + // Add widgets to the geometry manager // pushLayout->addSpacing( KDialog::spacingHint()*2 ); pushLayout->addWidget( d->pbtnShortcut ); @@ -439,7 +439,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->lInfo = new TQLabel(d->fCArea); //resize(0,0); - //d->lInfo->tqsetAlignment( AlignCenter ); + //d->lInfo->setAlignment( AlignCenter ); //d->lInfo->setEnabled( false ); //d->lInfo->hide(); grid->addMultiCellWidget( d->lInfo, 2, 2, 0, 3 ); @@ -532,7 +532,7 @@ void KKeyChooser::updateButtons() d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut ); //item->setText( 1, keyStrCfg ); - pItem->tqrepaint(); + pItem->repaint(); d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) ); // Select the appropriate radio button. @@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category ) void KKeyChooser::fontChange( const TQFont & ) { - d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() ); + d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() ); int widget_width = 0; @@ -610,7 +610,7 @@ void KKeyChooser::fontChange( const TQFont & ) // KDE4 IMHO this shouldn't be here at all - it cannot check whether the default // shortcut don't conflict with some already changed ones (e.g. global shortcuts). -// Also, I personally tqfind reseting all shortcuts to default (i.e. hardcoded in the app) +// Also, I personally find reseting all shortcuts to default (i.e. hardcoded in the app) // ones after pressing the 'Default' button rather a misfeature. void KKeyChooser::allDefault() { @@ -1010,7 +1010,7 @@ void KKeyChooserItem::setShortcut( const KShortcut& cut ) { m_cut = cut; m_bModified = (m_cut != m_pList->shortcut(m_iAction)); - listView()->tqrepaintItem( this ); + listView()->repaintItem( this ); } void KKeyChooserItem::commitChanges() diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp index 5e8f7e330..abbc4f5d3 100644 --- a/kdeui/klanguagebutton.cpp +++ b/kdeui/klanguagebutton.cpp @@ -60,12 +60,12 @@ static void checkInsertPos( TQPopupMenu *popup, const TQString & str, static TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu ) { - int pos = tags->tqfindIndex( submenu ); + int pos = tags->findIndex( submenu ); TQPopupMenu *pi = 0; if ( pos != -1 ) { - TQMenuItem *p = popup->tqfindItem( pos ); + TQMenuItem *p = popup->findItem( pos ); pi = p ? p->popup() : 0; } if ( !pi ) @@ -112,8 +112,8 @@ void KLanguageButton::init(const char * name) d->staticText = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, 0); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, 0); + layout->setAutoAdd(true); d->button = new TQPushButton( this, name ); // HPB don't touch this!! clear(); @@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton() void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, const TQString&, const TQString &submenu, int index ) { - TQString output = name + TQString::tqfromLatin1( " (" ) + path + - TQString::tqfromLatin1( ")" ); + TQString output = name + TQString::fromLatin1( " (" ) + path + + TQString::fromLatin1( ")" ); #if 0 // Nooooo ! Country != language TQPixmap flag( locate( "locale", sub + path + - TQString::tqfromLatin1( "/flag.png" ) ) ); + TQString::fromLatin1( "/flag.png" ) ) ); #endif insertItem( output, path, submenu, index ); } @@ -230,9 +230,9 @@ void KLanguageButton::clear() } } -bool KLanguageButton::tqcontains( const TQString & id ) const +bool KLanguageButton::contains( const TQString & id ) const { - return m_ids->tqcontains( id ) > 0; + return m_ids->contains( id ) > 0; } TQString KLanguageButton::current() const @@ -276,7 +276,7 @@ void KLanguageButton::setCurrentItem( int i ) void KLanguageButton::setCurrentItem( const TQString & id ) { - int i = m_ids->tqfindIndex( id ); + int i = m_ids->findIndex( id ); if ( id.isNull() ) i = 0; if ( i != -1 ) diff --git a/kdeui/klanguagebutton.h b/kdeui/klanguagebutton.h index 0736b50c7..c167930db 100644 --- a/kdeui/klanguagebutton.h +++ b/kdeui/klanguagebutton.h @@ -144,9 +144,9 @@ public: */ TQString current() const; /** - * Returns TRUE if the combobox tqcontains id. + * Returns TRUE if the combobox contains id. */ - bool tqcontains( const TQString & id ) const; + bool contains( const TQString & id ) const; /** * Sets id as current item. */ diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp index 605ff5345..b7980203b 100644 --- a/kdeui/kled.cpp +++ b/kdeui/kled.cpp @@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_tqshape(Circular) + led_shape(Circular) { TQColor col(green); d = new KLed::KLedPrivate; @@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_tqshape(Circular) + led_shape(Circular) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) } KLed::KLed(const TQColor& col, KLed::State state, - KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name ) + KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name ) : TQWidget(parent, name), led_state(state), led_look(look), - led_tqshape(tqshape) + led_shape(shape) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state, d->off_map = 0; d->on_map = 0; - //setShape(tqshape); + //setShape(shape); setColor(col); } @@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *) t.start(); for (int i=0; iargv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); } break; case Circular: @@ -145,11 +145,11 @@ KLed::paintEvent(TQPaintEvent *) paintSunken(); break; default: - qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); } break; default: - qWarning("%s: in class KLed: no KLed::Shape set",tqApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Shape set",qApp->argv()[0]); break; } #ifdef PAINT_BENCH @@ -229,7 +229,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp brush.setColor( color ); pen.setWidth( scale ); - color = tqcolorGroup().dark(); + color = colorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing @@ -325,7 +325,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // avoid that the border can be erased by the bright spot of the LED pen.setWidth( 2 * scale + 1 ); - color = tqcolorGroup().dark(); + color = colorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing brush.setStyle( TQBrush::NoBrush ); // Switch off the brush @@ -424,11 +424,11 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp brush.setStyle( TQBrush::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse - // Set the initial color value to tqcolorGroup().light() (bright) and start + // Set the initial color value to colorGroup().light() (bright) and start // drawing the shadow border at 45° (45*16 = 720). int angle = -720; - color = tqcolorGroup().light(); + color = colorGroup().light(); for ( int arc = 120; arc < 2880; arc += 240 ) { pen.setColor( color ); @@ -525,9 +525,9 @@ KLed::state() const } KLed::Shape -KLed::tqshape() const +KLed::shape() const { - return led_tqshape; + return led_shape; } QColor @@ -561,9 +561,9 @@ KLed::toggleState() void KLed::setShape(KLed::Shape s) { - if(led_tqshape!=s) + if(led_shape!=s) { - led_tqshape = s; + led_shape = s; update(); } } @@ -627,13 +627,13 @@ KLed::off() } QSize -KLed::tqsizeHint() const +KLed::sizeHint() const { return TQSize(16, 16); } QSize -KLed::tqminimumSizeHint() const +KLed::minimumSizeHint() const { return TQSize(16, 16 ); } diff --git a/kdeui/kled.h b/kdeui/kled.h index 2cffe0d84..580f01ab4 100644 --- a/kdeui/kled.h +++ b/kdeui/kled.h @@ -47,7 +47,7 @@ class KDEUI_EXPORT KLed : public QWidget Q_OBJECT Q_ENUMS( State Shape Look ) Q_PROPERTY( State state READ state WRITE setState ) - Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape ) + Q_PROPERTY( Shape shape READ shape WRITE setShape ) Q_PROPERTY( Look look READ look WRITE setLook ) Q_PROPERTY( TQColor color READ color WRITE setColor ) Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor ) @@ -55,14 +55,14 @@ class KDEUI_EXPORT KLed : public QWidget public: /** - * tqStatus of the light is on/off. + * Status of the light is on/off. * @short LED on/off. */ enum State { Off, On }; /** * Shades of the lamp. - * @short LED tqshape + * @short LED shape */ enum Shape { Rectangular, Circular }; @@ -114,12 +114,12 @@ public: * @param col Initial color of the LED. * @param state Sets the State. * @param look Sets the Look. - * @param tqshape Sets the Shape (rectangular or circular) + * @param shape Sets the Shape (rectangular or circular) * @param parent Will be handed over to TQWidget. * @param name Will be handed over to TQWidget. * @short Constructor */ - KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape, + KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape, TQWidget *parent=0, const char *name=0); @@ -137,7 +137,7 @@ public: */ State state() const; - Shape tqshape() const; + Shape shape() const; /** * Returns the color of the widget @@ -175,13 +175,13 @@ public: void setState( State state ); /** - * Set the tqshape of the LED to @p s. + * Set the shape of the LED to @p s. */ void setShape(Shape s); /** * Toggle the state of the LED from Off to On and vice versa. * - * The widget will be tqrepainted when returning to the main + * The widget will be repainted when returning to the main * event loop. * @short Toggles LED on->off / off->on. * @deprecated, use #toggle() instead. @@ -249,15 +249,15 @@ public: */ void setLook( Look look ); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: /** * Toggles the state of the led from Off to On or vice versa. * - * The widget tqrepaints itself immediately. + * The widget repaints itself immediately. */ void toggle(); @@ -317,7 +317,7 @@ private: State led_state; TQColor led_color; Look led_look; - Shape led_tqshape; + Shape led_shape; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index 01b50d7c9..f89f4cf25 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -441,17 +441,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KKey key( e ); - if ( KStdAccel::copy().tqcontains( key ) ) + if ( KStdAccel::copy().contains( key ) ) { copy(); return; } - else if ( KStdAccel::paste().tqcontains( key ) ) + else if ( KStdAccel::paste().contains( key ) ) { paste(); return; } - else if ( KStdAccel::pasteSelection().tqcontains( key ) ) + else if ( KStdAccel::pasteSelection().contains( key ) ) { TQString text = TQApplication::clipboard()->text( QClipboard::Selection); insert( text ); @@ -459,22 +459,22 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) return; } - else if ( KStdAccel::cut().tqcontains( key ) ) + else if ( KStdAccel::cut().contains( key ) ) { cut(); return; } - else if ( KStdAccel::undo().tqcontains( key ) ) + else if ( KStdAccel::undo().contains( key ) ) { undo(); return; } - else if ( KStdAccel::redo().tqcontains( key ) ) + else if ( KStdAccel::redo().contains( key ) ) { redo(); return; } - else if ( KStdAccel::deleteWordBack().tqcontains( key ) ) + else if ( KStdAccel::deleteWordBack().contains( key ) ) { cursorWordBackward(true); if ( hasSelectedText() ) @@ -483,7 +483,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) e->accept(); return; } - else if ( KStdAccel::deleteWordForward().tqcontains( key ) ) + else if ( KStdAccel::deleteWordForward().contains( key ) ) { // Workaround for QT bug where cursorWordForward(true); @@ -493,25 +493,25 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) e->accept(); return; } - else if ( KStdAccel::backwardWord().tqcontains( key ) ) + else if ( KStdAccel::backwardWord().contains( key ) ) { cursorWordBackward(false); e->accept(); return; } - else if ( KStdAccel::forwardWord().tqcontains( key ) ) + else if ( KStdAccel::forwardWord().contains( key ) ) { cursorWordForward(false); e->accept(); return; } - else if ( KStdAccel::beginningOfLine().tqcontains( key ) ) + else if ( KStdAccel::beginningOfLine().contains( key ) ) { home(false); e->accept(); return; } - else if ( KStdAccel::endOfLine().tqcontains( key ) ) + else if ( KStdAccel::endOfLine().contains( key ) ) { end(false); e->accept(); @@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) mode == KGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); - if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() || + if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { bool hasUserSelection=d->userSelection; @@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // as if there was no selection. After processing the key event, we // can set the new autocompletion again. if (hadSelection && !hasUserSelection && start>cPos && - ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { del(); @@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) int len = txt.length(); if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ && - ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete) ) { if ( e->key() == Key_Backspace ) @@ -729,7 +729,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[TextCompletion]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { // Emit completion if the completion mode is CompletionShell // and the cursor is at the end of the string. @@ -758,7 +758,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[PrevCompletionMatch]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit textRotation( KCompletionBase::PrevCompletionMatch ); @@ -773,7 +773,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[NextCompletionMatch]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit textRotation( KCompletionBase::NextCompletionMatch ); @@ -792,7 +792,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) else cut = keys[SubstringCompletion]; - if ( cut.tqcontains( key ) ) + if ( cut.contains( key ) ) { if ( emitSignals() ) emit substringCompletion( text() ); @@ -1134,7 +1134,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[TextCompletion]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; if (keys[NextCompletionMatch].isNull()) @@ -1142,7 +1142,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[NextCompletionMatch]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; if (keys[PrevCompletionMatch].isNull()) @@ -1150,31 +1150,31 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) else scKey = keys[PrevCompletionMatch]; - if (scKey.tqcontains( key )) + if (scKey.contains( key )) return true; // Override all the text manupilation accelerators... - if ( KStdAccel::copy().tqcontains( key ) ) + if ( KStdAccel::copy().contains( key ) ) return true; - else if ( KStdAccel::paste().tqcontains( key ) ) + else if ( KStdAccel::paste().contains( key ) ) return true; - else if ( KStdAccel::cut().tqcontains( key ) ) + else if ( KStdAccel::cut().contains( key ) ) return true; - else if ( KStdAccel::undo().tqcontains( key ) ) + else if ( KStdAccel::undo().contains( key ) ) return true; - else if ( KStdAccel::redo().tqcontains( key ) ) + else if ( KStdAccel::redo().contains( key ) ) return true; - else if (KStdAccel::deleteWordBack().tqcontains( key )) + else if (KStdAccel::deleteWordBack().contains( key )) return true; - else if (KStdAccel::deleteWordForward().tqcontains( key )) + else if (KStdAccel::deleteWordForward().contains( key )) return true; - else if (KStdAccel::forwardWord().tqcontains( key )) + else if (KStdAccel::forwardWord().contains( key )) return true; - else if (KStdAccel::backwardWord().tqcontains( key )) + else if (KStdAccel::backwardWord().contains( key )) return true; - else if (KStdAccel::beginningOfLine().tqcontains( key )) + else if (KStdAccel::beginningOfLine().contains( key )) return true; - else if (KStdAccel::endOfLine().tqcontains( key )) + else if (KStdAccel::endOfLine().contains( key )) return true; if (d->completionBox && d->completionBox->isVisible ()) @@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() ); const TQString currentSelection = d->completionBox->currentText(); d->completionBox->setItems( items ); - TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch ); // If no item is selected, that means the listbox hasn't been manipulated by the user yet, // because it's not possible otherwise to have no selected item. In such case make // always the first item current and unselected, so that the current item doesn't jump. @@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) if ( d->autoSuggest && autoSuggest ) { - int index = items.first().tqfind( txt ); + int index = items.first().find( txt ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); diff --git a/kdeui/klineeditdlg.cpp b/kdeui/klineeditdlg.cpp index c92f0a8bd..9551fc1f6 100644 --- a/kdeui/klineeditdlg.cpp +++ b/kdeui/klineeditdlg.cpp @@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, topLayout->addWidget( label, 1 ); edit = new KLineEdit( plainPage(), 0L ); - edit->setMinimumWidth(edit->tqsizeHint().width() * 3); + edit->setMinimumWidth(edit->sizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); connect( edit, TQT_SIGNAL(textChanged(const TQString&)), @@ -69,13 +69,13 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, TQWidget *parent, bool _file_mode ) : TQDialog( parent, 0L, true ) { - TQGridLayout *tqlayout = new TQGridLayout(this, 4, 3, 10); + TQGridLayout *layout = new TQGridLayout(this, 4, 3, 10); TQLabel *label = new TQLabel(_text, this); - tqlayout->addWidget(label, 0, 0, AlignLeft); + layout->addWidget(label, 0, 0, AlignLeft); edit = new KLineEdit( this, 0L ); - edit->setMinimumWidth(edit->tqsizeHint().width() * 3); + edit->setMinimumWidth(edit->sizeHint().width() * 3); connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); if ( _file_mode ) { @@ -85,22 +85,22 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, } else completion = 0L; - tqlayout->addMultiCellWidget(edit, 1, 1, 0, _file_mode ? 1 : 2); - tqlayout->setColStretch(1, 1); + layout->addMultiCellWidget(edit, 1, 1, 0, _file_mode ? 1 : 2); + layout->setColStretch(1, 1); if (_file_mode) { TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this); - tqlayout->addWidget(browse, 1, 2, AlignCenter); + layout->addWidget(browse, 1, 2, AlignCenter); connect(browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); } TQFrame *hLine = new TQFrame(this); hLine->setFrameStyle(TQFrame::Sunken|TQFrame::HLine); - tqlayout->addMultiCellWidget(hLine, 2, 2, 0, 2); + layout->addMultiCellWidget(hLine, 2, 2, 0, 2); KButtonBox *bBox = new KButtonBox(this); - tqlayout->addMultiCellWidget(bBox, 3, 3, 0, 2); + layout->addMultiCellWidget(bBox, 3, 3, 0, 2); TQPushButton *ok = bBox->addButton(KStdGuiItem::ok()); ok->setDefault(true); @@ -116,9 +116,9 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel()); connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - bBox->tqlayout(); + bBox->layout(); - tqlayout->activate(); + layout->activate(); edit->setText( _value ); edit->setSelection(0, edit->text().length()); diff --git a/kdeui/klineeditdlg.h b/kdeui/klineeditdlg.h index a46019abe..6e6fc2d89 100644 --- a/kdeui/klineeditdlg.h +++ b/kdeui/klineeditdlg.h @@ -34,7 +34,7 @@ class TQValidator; * Dialog for user to enter a single line of text. * * @version $Id$ - * @author David Faure , tqlayout management by Preston Brown + * @author David Faure , layout management by Preston Brown */ class KDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp index 657aa2870..332bc4e8c 100644 --- a/kdeui/klistview.cpp +++ b/kdeui/klistview.cpp @@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c) item=i; col=c; - TQRect rect(p->tqitemRect(i)); + TQRect rect(p->itemRect(i)); setText(item->text(c)); home( true ); @@ -263,7 +263,7 @@ static TQListViewItem *lastQChild (TQListViewItem *pi) if (pi) { /* Since there's no TQListViewItem::lastChild(). - * This tqfinds the last sibling for the given + * This finds the last sibling for the given * item. */ for (TQListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling()) @@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe ) && (currentItem())) { currentItem()->setSelected(true); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; } @@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe ) && (!d->editor->isVisible())) { currentItem()->setSelected(false); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; @@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) if (currentItem()) { currentItem()->setSelected(false); - currentItem()->tqrepaint(); + currentItem()->repaint(); // emit selectionChanged(); } } @@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) if (!rootDecoClicked) { int col = header()->mapToLogical( header()->cellAt( p.x() ) ); - if ( d->renameable.tqcontains(col) ) + if ( d->renameable.contains(col) ) rename(at, col); } } @@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanDropVisualizer(); d->mOldDropVisualizer=tmpRect; - viewport()->tqrepaint(tmpRect); + viewport()->repaint(tmpRect); } } if (dropHighlighter()) @@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanItemHighlighter(); d->mOldDropHighlighter=tmpRect; - viewport()->tqrepaint(tmpRect); + viewport()->repaint(tmpRect); } } } @@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer() { TQRect rect=d->mOldDropVisualizer; d->mOldDropVisualizer = TQRect(); - viewport()->tqrepaint(rect, true); + viewport()->repaint(rect, true); } } @@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView else { // Get the closest item before us ('atpos' or the one above, if any) - if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) + if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) above = atpos->itemAbove(); else above = atpos; @@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent, it = it->firstChild(); } - insertmarker = tqitemRect (it ? it : after); + insertmarker = itemRect (it ? it : after); level = after->depth(); } else if (parent) { - insertmarker = tqitemRect (parent); + insertmarker = itemRect (parent); level = parent->depth() + 1; } insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() ); @@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) if (item) { - r = tqitemRect(item); + r = itemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); if (painter) - style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(), - TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight()); + style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), + TQStyle::Style_FocusAtBorder, colorGroup().highlight()); } return r; @@ -1371,13 +1371,13 @@ void KListView::cleanItemHighlighter () { TQRect rect=d->mOldDropHighlighter; d->mOldDropHighlighter = TQRect(); - viewport()->tqrepaint(rect, true); + viewport()->repaint(rect, true); } } void KListView::rename(TQListViewItem *item, int c) { - if (d->renameable.tqcontains(c)) + if (d->renameable.contains(c)) { ensureItemVisible(item); d->editor->load(item,c); @@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c) bool KListView::isRenameable (int col) const { - return d->renameable.tqcontains(col); + return d->renameable.contains(col); } void KListView::setRenameable (int col, bool renameable) @@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection() if (currentItem()) { currentItem()->setSelected(true); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; } @@ -1519,8 +1519,8 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) TQListViewItem* item = currentItem(); if (!item) return; - TQListViewItem* tqrepaintItem1 = item; - TQListViewItem* tqrepaintItem2 = 0L; + TQListViewItem* repaintItem1 = item; + TQListViewItem* repaintItem2 = 0L; TQListViewItem* visItem = 0L; TQListViewItem* nextItem = 0L; @@ -1579,7 +1579,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) if (nextItem) { - tqrepaintItem2=nextItem; + repaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1614,7 +1614,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - tqrepaintItem2=nextItem; + repaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1649,7 +1649,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - tqrepaintItem2=nextItem; + repaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1671,7 +1671,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - tqrepaintItem2=nextItem; + repaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); } @@ -1684,7 +1684,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) // move to the first item and toggle selection of all items inbetween nextItem = firstChild(); visItem = nextItem; - tqrepaintItem2 = visItem; + repaintItem2 = visItem; if (d->selectedBySimpleMove) item->setSelected(false); if (shiftOrCtrl) @@ -1797,7 +1797,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) currentItem()->setSelected(true); emitSelectionChanged=true; } - tqrepaintItem2=currentItem(); + repaintItem2=currentItem(); if (realKey) visItem=currentItem(); break; @@ -1807,21 +1807,21 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) ensureItemVisible(visItem); TQRect ir; - if (tqrepaintItem1) - ir = ir.unite( tqitemRect(tqrepaintItem1) ); - if (tqrepaintItem2) - ir = ir.unite( tqitemRect(tqrepaintItem2) ); + if (repaintItem1) + ir = ir.unite( itemRect(repaintItem1) ); + if (repaintItem2) + ir = ir.unite( itemRect(repaintItem2) ); if ( !ir.isEmpty() ) - { // rectangle to be tqrepainted + { // rectangle to be repainted if ( ir.x() < 0 ) ir.moveBy( -ir.x(), 0 ); - viewport()->tqrepaint( ir, false ); + viewport()->repaint( ir, false ); } - /*if (tqrepaintItem1) - tqrepaintItem1->tqrepaint(); - if (tqrepaintItem2) - tqrepaintItem2->tqrepaint();*/ + /*if (repaintItem1) + repaintItem1->repaint(); + if (repaintItem2) + repaintItem2->repaint();*/ update(); if (emitSelectionChanged) emit selectionChanged(); @@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i) TQPoint p; if (i) - p = viewport()->mapToGlobal(tqitemRect(i).center()); + p = viewport()->mapToGlobal(itemRect(i).center()); else p = mapToGlobal(rect().center()); @@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } d->painting = false; @@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const void KListView::setAlternateBackground(const TQColor &c) { d->alternateBackground = c; - tqrepaint(); + repaint(); } void KListView::setShadeSortColumn(bool shadeSortColumn) { d->shadeSortColumn = shadeSortColumn; - tqrepaint(); + repaint(); } bool KListView::shadeSortColumn() const @@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor() { if (isAlternate()) return static_cast< KListView* >(listView())->alternateBackground(); - return listView()->viewport()->tqcolorGroup().base(); + return listView()->viewport()->colorGroup().base(); } TQColor KListViewItem::backgroundColor(int column) @@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column) KListView* view = static_cast< KListView* >(listView()); TQColor color = isAlternate() ? view->alternateBackground() : - view->viewport()->tqcolorGroup().base(); + view->viewport()->colorGroup().base(); // calculate a different color if the current column is sorted (only if more than 1 column) if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) ) @@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate() return false; } -void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; TQListView* lv = listView(); @@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, TQColorGroup::Background : TQColorGroup::Base, backgroundColor(column)); } - TQListViewItem::paintCell(p, _cg, column, width, tqalignment); + TQListViewItem::paintCell(p, _cg, column, width, alignment); } void KListView::virtual_hook( int, void* ) diff --git a/kdeui/klistview.h b/kdeui/klistview.h index 3f7df3f6c..d78ec2724 100644 --- a/kdeui/klistview.h +++ b/kdeui/klistview.h @@ -348,7 +348,7 @@ public: const TQColor &alternateBackground() const; /** - * Saves the list view's tqlayout (column widtsh, column order, sort column) + * Saves the list view's layout (column widtsh, column order, sort column) * to a KConfig group * * @param config the KConfig object to write to @@ -356,7 +356,7 @@ public: */ void saveLayout(KConfig *config, const TQString &group) const; /** - * Reads the list view's tqlayout from a KConfig group as stored with + * Reads the list view's layout from a KConfig group as stored with * saveLayout * * @param config the KConfig object to read from @@ -684,7 +684,7 @@ protected: */ inline bool below (TQListViewItem* i, const TQPoint& p) { - return below (tqitemRect(i), contentsToViewport(p)); + return below (itemRect(i), contentsToViewport(p)); } /** @@ -1002,7 +1002,7 @@ private: /** * A listview item with support for alternate background colors. It is - * a drop-in tqreplacement for QListViewItem + * a drop-in replacement for QListViewItem * * @short listview item with alternate background color support */ @@ -1069,7 +1069,7 @@ public: TQColor backgroundColor(int column); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); private: void init(); diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp index 6dc214d29..7bd26afc1 100644 --- a/kdeui/klistviewsearchline.cpp +++ b/kdeui/klistviewsearchline.cpp @@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s) it.current() && !currentItem; ++it) { - if(d->listView->tqitemRect(it.current()).isValid()) + if(d->listView->itemRect(it.current()).isValid()) currentItem = it.current(); } } @@ -214,14 +214,14 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString TQValueList::ConstIterator it = d->searchColumns.begin(); for(; it != d->searchColumns.end(); ++it) { if(*it < item->listView()->columns() && - item->text(*it).tqfind(s, 0, d->caseSensitive) >= 0) + item->text(*it).find(s, 0, d->caseSensitive) >= 0) return true; } } else { for(int i = 0; i < item->listView()->columns(); i++) { if(item->listView()->columnWidth(i) > 0 && - item->text(i).tqfind(s, 0, d->caseSensitive) >= 0) + item->text(i).find(s, 0, d->caseSensitive) >= 0) { return true; } @@ -260,7 +260,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); - if(d->searchColumns.isEmpty() || d->searchColumns.tqfind(i) != d->searchColumns.end()) + if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) subMenu->setItemChecked(visibleColumns, true); else allColumnsAreSearchColumns = false; @@ -320,7 +320,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id) d->searchColumns.clear(); } else { - if(d->searchColumns.tqfind(id) != d->searchColumns.end()) + if(d->searchColumns.find(id) != d->searchColumns.end()) d->searchColumns.remove(id); else { if(d->searchColumns.isEmpty()) { @@ -475,7 +475,7 @@ void KListViewSearchLineWidget::positionInToolBar() if(toolBar) { // Here we have The Big Ugly. Figure out how many widgets are in the - // and do a hack-ish iteration over them to tqfind this widget so that we + // and do a hack-ish iteration over them to find this widget so that we // can insert the clear button before it. int widgetCount = toolBar->count(); diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 31eecbebb..94baa34e7 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -64,7 +64,7 @@ public: bool autoSaveSettings:1; bool settingsDirty:1; bool autoSaveWindowSize:1; - bool care_about_tqgeometry:1; + bool care_about_geometry:1; bool shuttingDown:1; TQString autoSaveGroup; KAccel * kaccel; @@ -105,8 +105,8 @@ public: n++; it.current()->savePropertiesInternal(config, n); } - config->setGroup(TQString::tqfromLatin1("Number")); - config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n ); + config->setGroup(TQString::fromLatin1("Number")); + config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n ); return true; } @@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags) unusedNumber = 0; // add numbers only when needed } for(;;) { - TQWidgetList* list = kapp->tqtopLevelWidgets(); + TQWidgetList* list = kapp->topLevelWidgets(); TQWidgetListIt it( *list ); bool found = false; for( TQWidget* w = it.current(); @@ -243,10 +243,10 @@ void KMainWindow::initKMainWindow(const char *name, int cflags) d->settingsTimer = 0; d->showStatusBarAction = NULL; d->shuttingDown = false; - if ((d->care_about_tqgeometry = being_first)) { + if ((d->care_about_geometry = being_first)) { being_first = false; - if ( kapp->geometryArgument().isNull() ) // if there is no tqgeometry, it doesn't mater - d->care_about_tqgeometry = false; + if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't mater + d->care_about_geometry = false; else parseGeometry(false); } @@ -279,15 +279,15 @@ void KMainWindow::setupToolbarMenuActions() void KMainWindow::parseGeometry(bool parsewidth) { assert ( !kapp->geometryArgument().isNull() ); - assert ( d->care_about_tqgeometry ); + assert ( d->care_about_geometry ); #if defined Q_WS_X11 int x, y; int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if (parsewidth) { - TQSize minSize = tqminimumSize(); - TQSize maxSize = tqmaximumSize(); + TQSize minSize = minimumSize(); + TQSize maxSize = maximumSize(); if ( !(m & WidthValue) ) w = width(); if ( !(m & HeightValue) ) @@ -299,9 +299,9 @@ void KMainWindow::parseGeometry(bool parsewidth) resize(w, h); } else { if ( parsewidth && !(m & XValue) ) - x = tqgeometry().x(); + x = geometry().x(); if ( parsewidth && !(m & YValue) ) - y = tqgeometry().y(); + y = geometry().y(); if ( (m & XNegative) ) x = KApplication::desktop()->width() + x - w; if ( (m & YNegative) ) @@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number ) KConfig *config = kapp->sessionConfig(); if ( !config ) return false; - config->setGroup( TQString::tqfromLatin1("Number") ); - int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 ); + config->setGroup( TQString::fromLatin1("Number") ); + int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 ); return number >= 1 && number <= n; } @@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number ) return TQString::null; TQString s; s.setNum( number ); - s.prepend( TQString::tqfromLatin1("WindowProperties") ); + s.prepend( TQString::fromLatin1("WindowProperties") ); config->setGroup( s ); - if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) ) + if ( !config->hasKey( TQString::fromLatin1("ClassName") ) ) return TQString::null; else - return config->readEntry( TQString::tqfromLatin1("ClassName") ); + return config->readEntry( TQString::fromLatin1("ClassName") ); } void KMainWindow::show() @@ -545,7 +545,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory ) // In addition we have to take care of not removing containers // like popupmenus, defined in the XML document. // this code should probably go into a separate method in KMainWindow. - // there's just one problem: I'm bad in tqfinding names ;-) , so + // there's just one problem: I'm bad in finding names ;-) , so // I skipped this ;-) TQDomDocument doc = domDocument(); @@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number ) TQString s; s.setNum(number); - s.prepend(TQString::tqfromLatin1("WindowProperties")); + s.prepend(TQString::fromLatin1("WindowProperties")); config->setGroup(s); // store objectName, className, Width and Height for later restoring // (Only useful for session management) - config->writeEntry(TQString::tqfromLatin1("ObjectName"), name()); - config->writeEntry(TQString::tqfromLatin1("ClassName"), className()); + config->writeEntry(TQString::fromLatin1("ObjectName"), name()); + config->writeEntry(TQString::fromLatin1("ClassName"), className()); saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings. @@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config TQMenuBar* mb = internalMenuBar(); if (mb) { - TQString MenuBar = TQString::tqfromLatin1("MenuBar"); + TQString MenuBar = TQString::fromLatin1("MenuBar"); if(!config->hasDefault("MenuBar") && !mb->isHidden() ) config->revertToDefault("MenuBar"); else @@ -795,7 +795,7 @@ bool KMainWindow::isStandardToolBarMenuEnabled() const void KMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showtqStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); @@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number ) // in order they are in toolbar list TQString s; s.setNum(number); - s.prepend(TQString::tqfromLatin1("WindowProperties")); + s.prepend(TQString::fromLatin1("WindowProperties")); config->setGroup(s); // restore the object name (window role) - if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) ) - setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here + if ( config->hasKey(TQString::fromLatin1("ObjectName" )) ) + setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings. @@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force ) void KMainWindow::saveWindowSize( KConfig * config ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; #if defined Q_WS_X11 @@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const #endif TQRect size( desk.width(), w, desk.height(), h ); bool defaultSize = (size == d->defaultWindowSize); - TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width()); - TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height()); + TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width()); + TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height()); if (!config->hasDefault(widthString) && defaultSize) config->revertToDefault(widthString); else @@ -933,24 +933,24 @@ void KMainWindow::saveWindowSize( KConfig * config ) const void KMainWindow::restoreWindowSize( KConfig * config ) { - if (d->care_about_tqgeometry) { + if (d->care_about_geometry) { parseGeometry(true); } else { // restore the size - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if ( d->defaultWindowSize.isNull() ) // only once d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values - TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ), - config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) ); + TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ), + config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) ); if (size.isEmpty()) { // try the KDE 2.0 way - size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ), - config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) ); + size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ), + config->readNumEntry( TQString::fromLatin1("Height"), 0 ) ); if (!size.isEmpty()) { // make sure the other resolutions don't get old settings - config->writeEntry( TQString::tqfromLatin1("Width"), 0 ); - config->writeEntry( TQString::tqfromLatin1("Height"), 0 ); + config->writeEntry( TQString::fromLatin1("Width"), 0 ); + config->writeEntry( TQString::fromLatin1("Height"), 0 ); } } if ( !size.isEmpty() ) { @@ -979,12 +979,12 @@ void KMainWindow::restoreWindowSize( KConfig * config ) bool KMainWindow::initialGeometrySet() const { - return d->care_about_tqgeometry; + return d->care_about_geometry; } void KMainWindow::ignoreInitialGeometry() { - d->care_about_tqgeometry = false; + d->care_about_geometry = false; } void KMainWindow::setSettingsDirty() @@ -1073,7 +1073,7 @@ KMenuBar *KMainWindow::menuBar() KMenuBar * mb = internalMenuBar(); if ( !mb ) { mb = new KMenuBar( this ); - // trigger a re-tqlayout and trigger a call to the private + // trigger a re-layout and trigger a call to the private // setMenuBar method. TQMainWindow::menuBar(); } @@ -1085,7 +1085,7 @@ KStatusBar *KMainWindow::statusBar() KStatusBar * sb = internalStatusBar(); if ( !sb ) { sb = new KStatusBar( this ); - // trigger a re-tqlayout and trigger a call to the private + // trigger a re-layout and trigger a call to the private // setStatusBar method. TQMainWindow::statusBar(); } @@ -1188,16 +1188,16 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) { case KToolBar::Top: case KToolBar::Bottom: - size += TQSize(0, tb->tqsizeHint().height()); + size += TQSize(0, tb->sizeHint().height()); break; case KToolBar::Left: case KToolBar::Right: - size += TQSize(toolBar()->tqsizeHint().width(), 0); + size += TQSize(toolBar()->sizeHint().width(), 0); break; case KToolBar::Flat: - size += TQSize(0, 3+kapp->style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent )); + size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); break; default: @@ -1207,12 +1207,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) KMenuBar *mb = internalMenuBar(); if (mb && !mb->isHidden()) { size += TQSize(0,mb->heightForWidth(size.width())); - if (style().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) + if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) size += TQSize( 0, dockWindowsMovable() ? 1 : 2); } TQStatusBar *sb = internalStatusBar(); if( sb && !sb->isHidden() ) - size += TQSize(0, sb->tqsizeHint().height()); + size += TQSize(0, sb->sizeHint().height()); return size; } diff --git a/kdeui/kmainwindow.h b/kdeui/kmainwindow.h index b5536f51a..fbadc0471 100644 --- a/kdeui/kmainwindow.h +++ b/kdeui/kmainwindow.h @@ -50,7 +50,7 @@ class DCOPObject; * Top level widget that provides toolbars, a status line and a frame. * * It should be used as a top level (parent-less) widget. - * It manages the tqgeometry for all its children, including your + * It manages the geometry for all its children, including your * main widget. * * Normally, you will inherit from KMainWindow, @@ -74,7 +74,7 @@ class DCOPObject; * * KMainWindow will set icon, mini icon and caption, which it gets * from KApplication. It provides full session management, and - * will save its position, tqgeometry and positions of toolbars and + * will save its position, geometry and positions of toolbars and * menubar on logout. If you want to save additional data, reimplement * saveProperties() and (to read them again on next login) * readProperties(). To save special data about your data, reimplement @@ -168,7 +168,7 @@ public: /** * Retrieve the standard help menu. * - * It tqcontains entires for the + * It contains entires for the * help system (activated by F1), an optional "What's This?" entry * (activated by Shift F1), an application specific dialog box, * and an "About KDE" dialog box. @@ -195,7 +195,7 @@ public: /** * Returns the help menu. Creates a standard help menu if none exists yet. * - * It tqcontains entries for the + * It contains entries for the * help system (activated by F1), an optional "What's This?" entry * (activated by Shift F1), an application specific dialog box, * and an "About KDE" dialog box. You must create the application @@ -325,7 +325,7 @@ public: * then it will try to construct a local XML filename like * appnameui.rc where 'appname' is your app's name. If that file * does not exist, then the XML UI code will only use the global - * (standard) XML file for the tqlayout purposes. + * (standard) XML file for the layout purposes. * * Note that when passing true for the conserveMemory argument subsequent * calls to guiFactory()->addClient/removeClient may not work as expected. @@ -384,7 +384,7 @@ public: */ static TQPtrList* memberList; - //KDE4: tqreplace with memberList() and make memberList member private + //KDE4: replace with memberList() and make memberList member private /** * List of members of KMainWindow class. * @since 3.4 @@ -444,10 +444,10 @@ public: * have been created and placed inside the main window (i.e. for 99% of * apps setCentralWidget()) * - Widgets that inherit from TQWidget (like game boards) should overload - * "virtual TQSize tqsizeHint() const;" to specify a default size rather + * "virtual TQSize sizeHint() const;" to specify a default size rather * than letting TQWidget::adjust use the default size of 0x0. */ - void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"), + void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"), bool saveWindowSize = true ); /** @@ -576,7 +576,7 @@ public: Save = 8, /** - * calls createGUI() once ToolBar, Keys and tqStatusbar have been + * calls createGUI() once ToolBar, Keys and Statusbar have been * taken care of. See createGUI */ Create = 16 @@ -587,7 +587,7 @@ public: * fashion. The options are all enabled by default but can be turned * off if desired through the params or if the prereqs don't exists. * - * Typically this function tqreplaces createGUI(). + * Typically this function replaces createGUI(). * * @see StandardWindowOptions * @@ -602,7 +602,7 @@ public: * * @p defaultSize The default size of the window * - * Typically this function tqreplaces createGUI(). + * Typically this function replaces createGUI(). * * @see StandardWindowOptions * @@ -632,7 +632,7 @@ public: void finalizeGUI( bool force ); /** - * @return true if a -tqgeometry argument was given on the command line, + * @return true if a -geometry argument was given on the command line, * and this is the first window created (the one on which this option applies) */ bool initialGeometrySet() const; @@ -649,11 +649,11 @@ public: * * @deprecated You normally don't need this, the recommended way to achieve a * certain central widget size is as follows: - * @li Override tqsizeHint() in the central widget so that it + * @li Override sizeHint() in the central widget so that it * returns the desired size. * @li Call updateGeometry() in the central widget whenever the - * desired size changes. This ensures that the new tqsizeHint() is properly - * propagated to any parent tqlayout. + * desired size changes. This ensures that the new sizeHint() is properly + * propagated to any parent layout. * @li Now call adjustSize() in the mainwindow to resize the * mainwindow such that the central widget will become the desired size. * @@ -923,16 +923,16 @@ protected: /** * For inherited classes * Note that the group must be set before calling, and that - * a -tqgeometry on the command line has priority. + * a -geometry on the command line has priority. */ void restoreWindowSize( KConfig * config ); - /// parse the tqgeometry from the tqgeometry command line argument + /// parse the geometry from the geometry command line argument void parseGeometry(bool parsewidth); protected slots: /** - * Rebuilds the GUI after KEditToolbar changed the toolbar tqlayout. + * Rebuilds the GUI after KEditToolbar changed the toolbar layout. * @see configureToolbars() */ void saveNewToolbarConfig(); // TODO KDE4: make virtual and reimplement in KParts::MainWindow @@ -1016,7 +1016,7 @@ private: /** * These global convenience functions (that come with a varying - * number of template arguments) are a tqreplacement for the RESTORE + * number of template arguments) are a replacement for the RESTORE * macro provided in earlier versions of KDE. The old RESTORE macro * is still provided for backwards compatibility. See * KMainWindow documentation for more. @@ -1028,7 +1028,7 @@ template inline void kRestoreMainWindows() { for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) ) + if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) ) (new T)->restore( n ); } } @@ -1040,9 +1040,9 @@ inline void kRestoreMainWindows() { classNames[1] = T1::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::tqfromLatin1( classNames[0] ) ) + if ( className == TQString::fromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::tqfromLatin1( classNames[1] ) ) + else if ( className == TQString::fromLatin1( classNames[1] ) ) (new T1)->restore( n ); } } @@ -1055,11 +1055,11 @@ inline void kRestoreMainWindows() { classNames[2] = T2::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::tqfromLatin1( classNames[0] ) ) + if ( className == TQString::fromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::tqfromLatin1( classNames[1] ) ) + else if ( className == TQString::fromLatin1( classNames[1] ) ) (new T1)->restore( n ); - else if ( className == TQString::tqfromLatin1( classNames[2] ) ) + else if ( className == TQString::fromLatin1( classNames[2] ) ) (new T2)->restore( n ); } } diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index 5660b4cad..d2accb61d 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -136,7 +136,7 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) connect( &d->selection_timer, TQT_SIGNAL( timeout()), this, TQT_SLOT( selectionTimeout())); - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle @@ -163,8 +163,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) top_level = true; d->wasTopLevel = top_level; - if( tqparentWidget() - && tqparentWidget()->tqtopLevelWidget()->isFullScreen()) + if( parentWidget() + && parentWidget()->topLevelWidget()->isFullScreen()) top_level = false; if ( isTopLevelMenu() == top_level ) @@ -185,19 +185,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->margin = margin(); d->fallback_mode = false; bool wasShown = !isHidden(); - reparent( tqparentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false ); + reparent( parentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false ); #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); - if( tqparentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + if( parentWidget()) + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); TQMenuBar::setMargin( 0 ); updateFallbackSize(); d->min_size = TQSize( 0, 0 ); - if( tqparentWidget() && !tqparentWidget()->isTopLevel()) - setShown( tqparentWidget()->isVisible()); + if( parentWidget() && !parentWidget()->isTopLevel()) + setShown( parentWidget()->isVisible()); else if ( wasShown ) show(); } else @@ -213,8 +213,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); updateMenuBarSize(); - if ( tqparentWidget() ) - reparent( tqparentWidget(), TQPoint(0,0), !isHidden()); + if ( parentWidget() ) + reparent( parentWidget(), TQPoint(0,0), !isHidden()); } } @@ -240,34 +240,34 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( tqparentWidget() && obj == tqparentWidget()->tqtopLevelWidget() ) + if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable ) { - if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) ) + if ( TQApplication::sendEvent( topLevelWidget(), ev ) ) return true; } if(ev->type() == TQEvent::ShowFullScreen ) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( tqparentWidget() && obj == tqparentWidget() && ev->type() == TQEvent::Reparent ) + if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? #endif - setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible()); + setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( tqparentWidget() && !tqparentWidget()->isTopLevel() && obj == tqparentWidget()) + if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -279,10 +279,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( tqparentWidget() && obj == tqparentWidget()->tqtopLevelWidget()) + if( parentWidget() && obj == parentWidget()->topLevelWidget()) { if( ev->type() == TQEvent::WindowStateChange - && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() ) + && !parentWidget()->topLevelWidget()->isFullScreen() ) setTopLevelMenuInternal( d->wasTopLevel ); } } @@ -330,7 +330,7 @@ void KMenuBar::selectionTimeout() TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; if (kapp->desktop()->numScreens() < 2) - area = kapp->desktop()->tqgeometry(); + area = kapp->desktop()->geometry(); else area = kapp->desktop()->screenGeometry(screen); int margin = 0; @@ -372,7 +372,7 @@ void KMenuBar::setGeometry( int x, int y, int w, int h ) return; } checkSize( w, h ); - if( tqgeometry() != TQRect( x, y, w, h )) + if( geometry() != TQRect( x, y, w, h )) TQMenuBar::setGeometry( x, y, w, h ); } @@ -390,7 +390,7 @@ void KMenuBar::checkSize( int& w, int& h ) { if( !d->topLevel || d->fallback_mode ) return; - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); w = s.width(); h = s.height(); // This is not done as setMinimumSize(), because that would set the minimum @@ -400,17 +400,17 @@ void KMenuBar::checkSize( int& w, int& h ) h = KMAX( h, d->min_size.height()); } -// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet -TQSize KMenuBar::tqsizeHint() const +// QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet +TQSize KMenuBar::sizeHint() const { if( !d->topLevel || block_resize > 0 ) - return TQMenuBar::tqsizeHint(); - // Since TQMenuBar::tqsizeHint() may indirectly call resize(), + return TQMenuBar::sizeHint(); + // Since TQMenuBar::sizeHint() may indirectly call resize(), // avoid infinite recursion. ++block_resize; - // tqfind the minimum useful height, and enlarge the width until the menu fits in that height (one row) + // find the minimum useful height, and enlarge the width until the menu fits in that height (one row) int h = heightForWidth( 1000000 ); - int w = TQMenuBar::tqsizeHint().width(); + int w = TQMenuBar::sizeHint().width(); // optimization - don't call heightForWidth() too many times while( heightForWidth( w + 12 ) > h ) w += 12; @@ -444,7 +444,7 @@ bool KMenuBar::x11Event( XEvent* ev ) void KMenuBar::updateMenuBarSize() { menuContentsChanged(); // trigger invalidating calculated size - resize( tqsizeHint()); // and resize to preferred size + resize( sizeHint()); // and resize to preferred size } void KMenuBar::setFrameStyle( int style ) @@ -509,16 +509,16 @@ void KMenuBar::drawContents( TQPainter* p ) p->eraseRect( rect() ); erase(); - TQColorGroup g = tqcolorGroup(); + TQColorGroup g = colorGroup(); bool e; for ( int i=0; i<(int)count(); i++ ) { - TQMenuItem *mi = tqfindItem( idAt( i ) ); + TQMenuItem *mi = findItem( idAt( i ) ); if ( !mi->text().isNull() || mi->pixmap() ) { - TQRect r = tqitemRect(i); + TQRect r = itemRect(i); if(r.isEmpty() || !mi->isVisible()) continue; @@ -544,7 +544,7 @@ void KMenuBar::drawContents( TQPainter* p ) flags |= TQStyle::Style_Down; flags |= TQStyle::Style_HasFocus; - style().tqdrawControl(TQStyle::CE_MenuBarItem, p, this, + style().drawControl(TQStyle::CE_MenuBarItem, p, this, r, g, flags, TQStyleOption(mi)); } else diff --git a/kdeui/kmenubar.h b/kdeui/kmenubar.h index e0e19007c..548a0c12f 100644 --- a/kdeui/kmenubar.h +++ b/kdeui/kmenubar.h @@ -84,7 +84,7 @@ public: virtual void setFrameStyle( int ); virtual void setLineWidth( int ); virtual void setMargin( int ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected slots: void slotReadConfig(); protected: diff --git a/kdeui/kmessagebox.cpp b/kdeui/kmessagebox.cpp index dcfe0a83f..8e9256677 100644 --- a/kdeui/kmessagebox.cpp +++ b/kdeui/kmessagebox.cpp @@ -219,7 +219,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, } // We add 10 pixels extra to compensate for some KActiveLabel margins. - // TODO: tqfind out why this is 10. + // TODO: find out why this is 10. label2->setFixedSize(TQSize(pref_width+10, pref_height)); lay->addWidget( label2 ); lay->addStretch(); @@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if ( details.length() < 512 ) { KActiveLabel *label3 = new KActiveLabel(qrichtextify(details), detailsGroup); - label3->setMinimumSize(label3->tqsizeHint()); + label3->setMinimumSize(label3->sizeHint()); if (!(options & KMessageBox::AllowLink)) { TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), @@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, btn->setFocus(); if ( (options & KMessageBox::Notify) ) - sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId()); + sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId()); if (KMessageBox_queue) { @@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, ButtonCode &result) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); @@ -361,7 +361,7 @@ bool KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); @@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, ButtonCode result) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); @@ -383,7 +383,7 @@ void KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, @@ -936,7 +936,7 @@ void KMessageBox::enableAllMessages() { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -956,7 +956,7 @@ void KMessageBox::enableMessage(const TQString &dontShowAgainName) { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/kdeui/kmessagebox.h b/kdeui/kmessagebox.h index 96f907879..a543e106f 100644 --- a/kdeui/kmessagebox.h +++ b/kdeui/kmessagebox.h @@ -740,7 +740,7 @@ public: * or your user did something stupid. * * To be used for small problems like - * "Sorry, I can't tqfind the file you specified." + * "Sorry, I can't find the file you specified." * * The default button is "&OK". Pressing "Esc" selects the OK-button. * @@ -778,7 +778,7 @@ public: * or your user did something stupid. * * To be used for small problems like - * "Sorry, I can't tqfind the file you specified." + * "Sorry, I can't find the file you specified." * * And then @p details can contain something like * "foobar.txt was not found in any of @@ -1100,7 +1100,7 @@ public: static void setDontShowAskAgainConfig(KConfig* cfg); /** - * Create content and tqlayout of a standard dialog + * Create content and layout of a standard dialog * * @param dialog The parent dialog base * @param icon Which predefined icon the message box shall show. @@ -1114,7 +1114,7 @@ public: * @param details Detailed message string. * @since 3.3 * @return A KDialogBase button code, not a KMessageBox button code, - * based on the buttontqmask given to the constructor of the + * based on the buttonmask given to the constructor of the * @p dialog (ie. will return KDialogBase::Yes [256] instead of * KMessageBox::Yes [3]). Will return KMessageBox::Cancel * if the message box is queued for display instead of @@ -1128,7 +1128,7 @@ public: int options, const TQString &details=TQString::null); /** - * Create content and tqlayout of a standard dialog + * Create content and layout of a standard dialog * * @param dialog The parent dialog base * @param icon A TQPixmap containing the icon to be displayed in the @@ -1145,7 +1145,7 @@ public: * is presentend. * @since 3.3 * @return A KDialogBase button code, not a KMessageBox button code, - * based on the buttontqmask given to the constructor of the + * based on the buttonmask given to the constructor of the * @p dialog (ie. will return KDialogBase::Yes [256] instead of * KMessageBox::Yes [3]). Will return KMessageBox::Cancel * if the message box is queued for display instead of diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp index 8e9c00d4f..4d3075bb2 100644 --- a/kdeui/knuminput.cpp +++ b/kdeui/knuminput.cpp @@ -86,7 +86,7 @@ void KNumInput::init() m_label = 0; m_slider = 0; - m_tqalignment = 0; + m_alignment = 0; } KNumInput::~KNumInput() @@ -103,20 +103,20 @@ void KNumInput::setLabel(const TQString & label, int a) if(label.isEmpty()) { delete m_label; m_label = 0; - m_tqalignment = 0; + m_alignment = 0; } else { if (m_label) m_label->setText(label); else m_label = new TQLabel(label, this, "KNumInput::TQLabel"); - m_label->tqsetAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) + m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) | AlignVCenter); - // if no vertical tqalignment set, use Top tqalignment + // if no vertical alignment set, use Top alignment if(!(a & (AlignTop|AlignBottom|AlignVCenter))) a |= AlignTop; - m_tqalignment = a; + m_alignment = a; } - tqlayout(true); + layout(true); } TQString KNumInput::label() const @@ -125,21 +125,21 @@ TQString KNumInput::label() const return TQString::null; } -void KNumInput::tqlayout(bool deep) +void KNumInput::layout(bool deep) { int w1 = m_colw1; int w2 = m_colw2; - // label tqsizeHint - m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0)); + // label sizeHint + m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0)); - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_colw1 = m_sizeLabel.width() + 4; else m_colw1 = 0; - // slider tqsizeHint - m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0)); + // slider sizeHint + m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0)); doLayout(); @@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KNumInput::tqsizeHint() const +TQSize KNumInput::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KNumInput::setSteps(int minor, int major) @@ -204,7 +204,7 @@ void KNumInput::setSteps(int minor, int major) KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) : TQSpinBox(0, 99, 1, parent, name) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); val_base = 10; setValue(0); } @@ -217,7 +217,7 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, TQWidget* parent, const char* name) : TQSpinBox(lower, upper, step, parent, name) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); val_base = base; setValue(value); } @@ -298,7 +298,7 @@ void KIntNumInput::init(int val, int _base) TQT_SLOT(slotEmitRelativeValueChanged(int))); setFocusProxy(m_spin); - tqlayout(true); + layout(true); } void KIntNumInput::setReferencePoint( int ref ) { @@ -360,7 +360,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) // check that reference point is still inside valid range: setReferencePoint( referencePoint() ); - tqlayout(true); + layout(true); } void KIntNumInput::setMinValue(int min) @@ -387,7 +387,7 @@ void KIntNumInput::setSuffix(const TQString &suffix) { m_spin->setSuffix(suffix); - tqlayout(true); + layout(true); } TQString KIntNumInput::suffix() const @@ -399,7 +399,7 @@ void KIntNumInput::setPrefix(const TQString &prefix) { m_spin->setPrefix(prefix); - tqlayout(true); + layout(true); } TQString KIntNumInput::prefix() const @@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark) m_spin->setEditFocus(mark); } -TQSize KIntNumInput::tqminimumSizeHint() const +TQSize KIntNumInput::minimumSizeHint() const { constPolish(); @@ -422,16 +422,16 @@ TQSize KIntNumInput::tqminimumSizeHint() const h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) + if(m_label && (m_alignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; + w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_tqalignment & (AlignTop|AlignBottom)) + if(m_alignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -439,7 +439,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const void KIntNumInput::doLayout() { - m_sizeSpin = m_spin->tqsizeHint(); + m_sizeSpin = m_spin->sizeHint(); m_colw2 = m_sizeSpin.width(); if (m_label) @@ -451,15 +451,15 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_tqalignment & AlignTop)) { + if(m_label && (m_alignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + KDialog::spacingHint(); } - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeSpin.height()); - if (tqApp->reverseLayout()) + if (qApp->reverseLayout()) { m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height()); w += m_colw2 + 8; @@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeSpin.height() + 2; - if(m_label && (m_tqalignment & AlignBottom)) + if(m_label && (m_alignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } @@ -512,7 +512,7 @@ int KIntNumInput::value() const void KIntNumInput::setSpecialValueText(const TQString& text) { m_spin->setSpecialValueText(text); - tqlayout(true); + layout(true); } TQString KIntNumInput::specialValueText() const @@ -618,7 +618,7 @@ void KDoubleNumInput::init(double value, double lower, double upper, updateLegacyMembers(); - tqlayout(true); + layout(true); } void KDoubleNumInput::updateLegacyMembers() { @@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value ) emit relativeValueChanged( value / d->referencePoint ); } -TQSize KDoubleNumInput::tqminimumSizeHint() const +TQSize KDoubleNumInput::minimumSizeHint() const { constPolish(); @@ -663,16 +663,16 @@ TQSize KDoubleNumInput::tqminimumSizeHint() const h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) + if(m_label && (m_alignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; + w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_tqalignment & (AlignTop|AlignBottom)) + if(m_alignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -683,15 +683,15 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_tqalignment & AlignTop)) { + if(m_label && (m_alignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + 4; } - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeEdit.height()); - if (tqApp->reverseLayout()) + if (qApp->reverseLayout()) { d->spin->setGeometry(w, h, m_slider ? m_colw2 : e->size().width() - w, m_sizeEdit.height()); @@ -713,13 +713,13 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeEdit.height() + 2; - if(m_label && (m_tqalignment & AlignBottom)) + if(m_label && (m_alignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } void KDoubleNumInput::doLayout() { - m_sizeEdit = d->spin->tqsizeHint(); + m_sizeEdit = d->spin->sizeHint(); m_colw2 = m_sizeEdit.width(); } @@ -786,7 +786,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, setReferencePoint( referencePoint() ); - tqlayout(true); + layout(true); updateLegacyMembers(); } @@ -840,21 +840,21 @@ void KDoubleNumInput::setSuffix(const TQString &suffix) { d->spin->setSuffix( suffix ); - tqlayout(true); + layout(true); } void KDoubleNumInput::setPrefix(const TQString &prefix) { d->spin->setPrefix( prefix ); - tqlayout(true); + layout(true); } void KDoubleNumInput::setPrecision(int precision) { d->spin->setPrecision( precision ); - tqlayout(true); + layout(true); } int KDoubleNumInput::precision() const @@ -866,7 +866,7 @@ void KDoubleNumInput::setSpecialValueText(const TQString& text) { d->spin->setSpecialValueText( text ); - tqlayout(true); + layout(true); updateLegacyMembers(); } @@ -915,7 +915,7 @@ TQValidator::State KDoubleSpinBoxValidator::validate( TQString& str, int& pos ) int corePos = pos - pref.length(); state = KDoubleValidator::validate( core, corePos ); pos = corePos + pref.length(); - str.tqreplace( pref.length(), str.length() - overhead, core ); + str.replace( pref.length(), str.length() - overhead, core ); } else { state = KDoubleValidator::validate( str, pos ); if ( state == Invalid ) { @@ -996,7 +996,7 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->tqsetAlignment( Qt::AlignRight ); + editor()->setAlignment( Qt::AlignRight ); d = new Private(); updateValidator(); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); @@ -1007,7 +1007,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->tqsetAlignment( Qt::AlignRight ); + editor()->setAlignment( Qt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); diff --git a/kdeui/knuminput.h b/kdeui/knuminput.h index 882e9d3ec..4c4c90732 100644 --- a/kdeui/knuminput.h +++ b/kdeui/knuminput.h @@ -67,7 +67,7 @@ public: ~KNumInput(); /** - * Sets the text and tqalignment of the main description label. + * Sets the text and alignment of the main description label. * * @param label The text of the label. * Use TQString::null to remove an existing one. @@ -76,7 +76,7 @@ public: * @p AlignTop, @p AlignVCenter, @p AlignBottom. * default is @p AlignLeft | @p AlignTop. * - * The vertical tqalignment flags have special meaning with this + * The vertical alignment flags have special meaning with this * widget: * * @li @p AlignTop The label is placed above the edit/slider @@ -116,18 +116,18 @@ public: * * @return the preferred size necessary to show the control */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: /** - * Call this function whenever you change something in the tqgeometry + * Call this function whenever you change something in the geometry * of your KNumInput child. * */ - void tqlayout(bool deep); + void layout(bool deep); /** - * You need to overwrite this method and implement your tqlayout + * You need to overwrite this method and implement your layout * calculations there. * * See KIntNumInput::doLayout and KDoubleNumInput::doLayout implementation @@ -143,7 +143,7 @@ protected: TQSlider* m_slider; TQSize m_sizeSlider, m_sizeLabel; - int m_tqalignment; + int m_alignment; private: void init(); @@ -222,9 +222,9 @@ public: * the difference to the one above is the "below" parameter. It tells * this instance that it is visually put below some other KNumInput widget. * Note that these two KNumInput's need not to have the same parent widget - * or be in the same tqlayout group. - * The effect is that it'll adjust it's tqlayout in correspondence - * with the tqlayout of the other KNumInput's (you can build an arbitrary long + * or be in the same layout group. + * The effect is that it'll adjust it's layout in correspondence + * with the layout of the other KNumInput's (you can build an arbitrary long * chain). * * @param below append KIntNumInput to the KNumInput chain @@ -312,11 +312,11 @@ public: /** * This method returns the minimum size necessary to display the * control. The minimum size is enough to show all the labels - * in the current font (font change may tqinvalidate the return value). + * in the current font (font change may invalidate the return value). * * @return the minimum size necessary to show the control */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: /** @@ -498,9 +498,9 @@ public: * the difference here is the "below" parameter. It tells this * instance that it is visually put below some other KNumInput * widget. Note that these two KNumInput's need not to have the - * same parent widget or be in the same tqlayout group. The effect - * is that it'll adjust it's tqlayout in correspondence with the - * tqlayout of the other KNumInput's (you can build an arbitrary long + * same parent widget or be in the same layout group. The effect + * is that it'll adjust it's layout in correspondence with the + * layout of the other KNumInput's (you can build an arbitrary long * chain). * * @param below append KDoubleNumInput to the KDoubleNumInput chain @@ -596,7 +596,7 @@ public: void setSpecialValueText(const TQString& text); virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; virtual bool eventFilter(TQObject*, TQEvent*); public slots: @@ -807,7 +807,7 @@ private: \endcode Since the value, bounds and lineStep are rounded to the current - precision, you may tqfind that the order of setting these + precision, you may find that the order of setting these parameters matters. As an example, the following are @em not equivalent (try it!): @@ -871,7 +871,7 @@ public: int precision() const; /** Equivalent to setPrecision( @p precision, @p false ); Needed - since Qt's tqmoc doesn't ignore trailing parameters with default + since Qt's moc doesn't ignore trailing parameters with default args when searching for a property setter method. */ void setPrecision( int precision ); diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp index e60730eed..436f95431 100644 --- a/kdeui/knumvalidator.cpp +++ b/kdeui/knumvalidator.cpp @@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const if (_base > 10) newStr = newStr.upper(); - if (newStr == TQString::tqfromLatin1("-")) // a special case + if (newStr == TQString::fromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else @@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const TQString newStr; newStr = str.stripWhiteSpace(); - if (newStr == TQString::tqfromLatin1("-")) // a special case + if (newStr == TQString::fromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { @@ -339,30 +339,30 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const t = l->thousandsSeparator(); // first, delete p's and t's: if ( !p.isEmpty() ) - for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) ) + for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) ) s.remove( idx, p.length() ); if ( !t.isEmpty() ) - for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) ) + for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) ) s.remove( idx, t.length() ); - // then, tqreplace the d's and n's - if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) || - ( !d.isEmpty() && d.tqfind('-') != -1 ) ) { - // make sure we don't tqreplace something twice: - kdWarning() << "KDoubleValidator: decimal symbol tqcontains '-' or " - "negative sign tqcontains '.' -> improve algorithm" << endl; + // then, replace the d's and n's + if ( ( !n.isEmpty() && n.find('.') != -1 ) || + ( !d.isEmpty() && d.find('-') != -1 ) ) { + // make sure we don't replace something twice: + kdWarning() << "KDoubleValidator: decimal symbol contains '-' or " + "negative sign contains '.' -> improve algorithm" << endl; return Invalid; } if ( !d.isEmpty() && d != "." ) - for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) ) - s.tqreplace( idx, d.length(), '.'); + for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) ) + s.replace( idx, d.length(), '.'); if ( !n.isEmpty() && n != "-" ) - for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) ) - s.tqreplace( idx, n.length(), '-' ); + for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) ) + s.replace( idx, n.length(), '-' ); } return base::validate( s, p ); diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index f89305f1f..817d9de60 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, : TQFrame(parent, name, f) , _type(type) , _position( pBottom ) - , _tqalignment( LeftTop ) + , _alignment( LeftTop ) , _config(0) , _actions(actions) , d(new KPanelApplet::KPanelAppletPrivate()) @@ -78,11 +78,11 @@ void KPanelApplet::setPosition( Position p ) positionChange( p ); } -void KPanelApplet::tqsetAlignment( Alignment a ) +void KPanelApplet::setAlignment( Alignment a ) { - if( _tqalignment == a ) return; - _tqalignment = a; - tqalignmentChange( a ); + if( _alignment == a ) return; + _alignment = a; + alignmentChange( a ); } // FIXME: Remove implementation for KDE 4 @@ -146,13 +146,13 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.tqfind(widget) == -1) + if (d->watchedForFocus.find(widget) == -1) { d->watchedForFocus.append(widget); widget->installEventFilter(this); } } - else if (d->watchedForFocus.tqfind(widget) != -1) + else if (d->watchedForFocus.find(widget) != -1) { d->watchedForFocus.remove(widget); widget->removeEventFilter(this); @@ -172,7 +172,7 @@ void KPanelApplet::needsFocus(bool focus) bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) { - if (d->watchedForFocus.tqfind(o) != -1) + if (d->watchedForFocus.find(o) != -1) { if (e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::FocusIn) diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index 859906adb..7719c7b68 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -106,7 +106,7 @@ public: enum Type { Normal = 0, Stretch }; /** * This enum holds flags which can be ORed together to describe - * which items the context menu over the applet handle tqcontains. + * which items the context menu over the applet handle contains. */ // KDE4: Merge these with KPanelExtension's enums enum Action { About = 1, Help = 2, Preferences = 4, ReportBug = 8 }; @@ -224,22 +224,22 @@ public: /** * @internal **/ - void tqsetAlignment( Alignment a ); + void setAlignment( Alignment a ); signals: /** - * Emit this signal to make the panel retqlayout all applets, when + * Emit this signal to make the panel relayout all applets, when * you want to change your width (horizontal panel) or * height (vertical panel). * - * The panel is going to retqlayout all applets based on their + * The panel is going to relayout all applets based on their * widthForHeight(int height) (horizontal panel) or * heightForWidth(int width) (vertical panel). * * Please note that the panel may change the applet's location * if the new widthForHeight(int height) (horizontal panel) or * heightForWidth(int width) (vertical panel) does not fit into the - * current panel tqlayout. + * current panel layout. **/ void updateLayout(); @@ -308,9 +308,9 @@ protected: **/ Position position() const { return _position; } /** - * @return the applet's tqalignment. (top/left, center, or bottom/right) + * @return the applet's alignment. (top/left, center, or bottom/right) **/ - Alignment tqalignment() const { return _tqalignment; } + Alignment alignment() const { return _alignment; } /** * The panel on which this applet resides has changed its position. @@ -320,11 +320,11 @@ protected: virtual void positionChange( Position p ); /** - * The panel on which this applet resides has changed its tqalignment. + * The panel on which this applet resides has changed its alignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment /*a*/ ) {} + virtual void alignmentChange( Alignment /*a*/ ) {} /** * Use this method to set the custom menu for this applet so that it can be shown @@ -383,7 +383,7 @@ protected: private: Type _type; Position _position; - Alignment _tqalignment; + Alignment _alignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index 57db25c66..538756758 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type, : TQFrame(parent, name) , _type(type) , _position( Top ) - , _tqalignment( LeftTop ) + , _alignment( LeftTop ) , _config(0) , _actions(actions) { @@ -71,11 +71,11 @@ void KPanelExtension::setPosition( Position p ) positionChange( p ); } -void KPanelExtension::tqsetAlignment( Alignment a ) +void KPanelExtension::setAlignment( Alignment a ) { - if( _tqalignment == a ) return; - _tqalignment = a; - tqalignmentChange( a ); + if( _alignment == a ) return; + _alignment = a; + alignmentChange( a ); } void KPanelExtension::setSize( Size size, int customSize ) diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index 7e223f8ac..8fe97956d 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -136,7 +136,7 @@ public: * location in the Window Manager Dock. Please note that the size can not be larger than the * maxsize given by the handler. **/ - virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } + virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } /** * Always use this KConfig object to save/load your extensions configuration. @@ -189,7 +189,7 @@ public: /** * @internal **/ - void tqsetAlignment( Alignment a ); + void setAlignment( Alignment a ); /** * @internal * @since 3.1 @@ -216,7 +216,7 @@ public: TQPopupMenu* customMenu() const; /** - * @return whether or not to set a desktop tqgeometry claiming strut for this panel + * @return whether or not to set a desktop geometry claiming strut for this panel * defaults to true * @see setReservetrut(bool) * @since 3.4 @@ -225,9 +225,9 @@ public: signals: /** - * Emit this signal to make the panel retqlayout all extensions in the dock, when you want + * Emit this signal to make the panel relayout all extensions in the dock, when you want * to change the extensions size. - * The panel is going to retqlayout all extensions based on their preferred size. + * The panel is going to relayout all extensions based on their preferred size. **/ void updateLayout(); @@ -282,9 +282,9 @@ protected: Position position() const { return _position; } /** - * @return the extension's tqalignment. (left/top, center, or right/bottom) + * @return the extension's alignment. (left/top, center, or right/bottom) **/ - Alignment tqalignment() const { return _tqalignment; } + Alignment alignment() const { return _alignment; } /** * @return the extensions orientation. (horizontal or vertical) @@ -305,11 +305,11 @@ protected: virtual void positionChange( Position ) {} /** - * This extension has changed its tqalignment. + * This extension has changed its alignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment ) {} + virtual void alignmentChange( Alignment ) {} /** * Use this method to set the custom menu for this extensions so that it can be shown @@ -333,7 +333,7 @@ protected: private: Type _type; Position _position; - Alignment _tqalignment; + Alignment _alignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpanelmenu.h b/kdeui/kpanelmenu.h index afa0fdc9e..de0b065eb 100644 --- a/kdeui/kpanelmenu.h +++ b/kdeui/kpanelmenu.h @@ -44,7 +44,7 @@ class KPanelMenuPrivate; * the menu object. * * Finally, you also have to provide a desktop file describing your dynamic menu. The - * relevant entries are: Name, Comment, Icon and X-KDE-Library (which tqcontains the + * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the * library name without any extension). This desktop file has to be installed in * $KDEDIR/share/apps/kicker/menuext/. * @@ -87,7 +87,7 @@ public: */ void setPath(const TQString &p); /** - * Tell if the menu has been initialized, that is it already tqcontains items. + * Tell if the menu has been initialized, that is it already contains items. * This is useful when you need to know if you have to clear the menu, or to * fill it. * @return the initial state diff --git a/kdeui/kpartgui.dtd b/kdeui/kpartgui.dtd index 36cbe2a4d..a3cbb8121 100644 --- a/kdeui/kpartgui.dtd +++ b/kdeui/kpartgui.dtd @@ -12,7 +12,7 @@ --> ") + m_widget -> name (); dsc . append (TQString (" (") + m_widget -> className () + ")\n"); - for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) { + for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) { dsc . append (w -> name ()); dsc . append (TQString (" (") + w -> className () + ")\n"); } - w = m_widget -> tqtopLevelWidget (); + w = m_widget -> topLevelWidget (); if (w) { dsc . append ("toplevel --> "); dsc . append (w -> name ()); @@ -80,7 +80,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) } body . append (dsc); TQString subj ("What's This submission: "); - subj . append (tqApp -> argv () [0]); + subj . append (qApp -> argv () [0]); body . append ("\nPlease type in your what's this help between these lines: " "\n--%-----------------------------------------------------------------------\n" "\n--%-----------------------------------------------------------------------"); @@ -99,7 +99,7 @@ void KWhatsThisManager::init () KWhatsThisManager::KWhatsThisManager () { // go away... - // tqApp -> installEventFilter (this); + // qApp -> installEventFilter (this); } bool KWhatsThisManager::eventFilter (TQObject * /*o*/, TQEvent *e) diff --git a/kdeui/kwhatsthismanager_p.h b/kdeui/kwhatsthismanager_p.h index 919ffd197..f797dc4d3 100644 --- a/kdeui/kwhatsthismanager_p.h +++ b/kdeui/kwhatsthismanager_p.h @@ -43,7 +43,7 @@ class TQTextEdit; * @see QWhatsThis * @author Peter Rockai (mornfall) **/ -class KDEUI_EXPORT KWhatsThisManager : public TQObject +class KDEUI_EXPORT KWhatsThisManager : public QObject { Q_OBJECT public: diff --git a/kdeui/kwindowinfo.h b/kdeui/kwindowinfo.h index 167d3e0a9..efd797c91 100644 --- a/kdeui/kwindowinfo.h +++ b/kdeui/kwindowinfo.h @@ -38,7 +38,7 @@ * @author Richard Moore, rich@kde.org * @since 3.1 */ -class KDEUI_EXPORT KWindowInfo : public TQObject +class KDEUI_EXPORT KWindowInfo : public QObject { Q_OBJECT diff --git a/kdeui/kwindowlistmenu.cpp b/kdeui/kwindowlistmenu.cpp index 0be4c2f4e..de9cd0c08 100644 --- a/kdeui/kwindowlistmenu.cpp +++ b/kdeui/kwindowlistmenu.cpp @@ -186,7 +186,7 @@ void KWindowListMenu::init() } // Avoid creating unwanted accelerators. - itemText.tqreplace('&', TQString::tqfromLatin1("&&")); + itemText.replace('&', TQString::fromLatin1("&&")); insertItem( pm, itemText, i); map.insert(i, info->win()); if (info->win() == active_window) diff --git a/kdeui/kwordwrap.cpp b/kdeui/kwordwrap.cpp index 26f5211fd..9c6427eb5 100644 --- a/kdeui/kwordwrap.cpp +++ b/kdeui/kwordwrap.cpp @@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla { KWordWrap* kw = new KWordWrap( r ); // The wordwrap algorithm - // The variable names and the global tqshape of the algorithm are inspired + // The variable names and the global shape of the algorithm are inspired // from QTextFormatterBreakWords::format(). //kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl; int height = fm.height(); diff --git a/kdeui/kwordwrap.h b/kdeui/kwordwrap.h index 232cb826c..22fcf940a 100644 --- a/kdeui/kwordwrap.h +++ b/kdeui/kwordwrap.h @@ -91,12 +91,12 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is + * Flags are for alignment, e.g. Qt::AlignHCenter. Default is * Qt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text - * @param flags the ORed text tqalignment flags from the Qt namespace, + * @param flags the ORed text alignment flags from the Qt namespace, * ORed with FadeOut if you want the text to fade out if it * does not fit (the @p painter's background must be set * accordingly) diff --git a/kdeui/kxmlgui.xsd b/kdeui/kxmlgui.xsd index f3fab6291..c0979cb72 100644 --- a/kdeui/kxmlgui.xsd +++ b/kdeui/kxmlgui.xsd @@ -56,7 +56,7 @@ - The name used for every name and group attribute. Maps to TQObject::name() in most cases. + The name used for every name and group attribute. Maps to QObject::name() in most cases. @@ -252,7 +252,7 @@ The root element that must enclose all other tags in the document. This - element tqreplaces the kpartgui element used previously. + element replaces the kpartgui element used previously. Note: do not forget to increase the version attribute for each change in your file, otherwise the changes will not be taken into account. diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp index f61aaaf2b..305ce135c 100644 --- a/kdeui/kxmlguibuilder.cpp +++ b/kdeui/kxmlguibuilder.cpp @@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget ) d = new KXMLGUIBuilderPrivate; d->m_widget = widget; - d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" ); - d->tagMenuBar = TQString::tqfromLatin1( "menubar" ); - d->tagMenu = TQString::tqfromLatin1( "menu" ); - d->tagToolBar = TQString::tqfromLatin1( "toolbar" ); - d->tagStatusBar = TQString::tqfromLatin1( "statusbar" ); + d->tagMainWindow = TQString::fromLatin1( "mainwindow" ); + d->tagMenuBar = TQString::fromLatin1( "menubar" ); + d->tagMenu = TQString::fromLatin1( "menu" ); + d->tagToolBar = TQString::fromLatin1( "toolbar" ); + d->tagStatusBar = TQString::fromLatin1( "statusbar" ); - d->tagSeparator = TQString::tqfromLatin1( "separator" ); - d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" ); - d->tagMenuTitle = TQString::tqfromLatin1( "title" ); + d->tagSeparator = TQString::fromLatin1( "separator" ); + d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" ); + d->tagMenuTitle = TQString::fromLatin1( "title" ); - d->attrName = TQString::tqfromLatin1( "name" ); - d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" ); + d->attrName = TQString::fromLatin1( "name" ); + d->attrLineSeparator = TQString::fromLatin1( "lineseparator" ); - d->attrText1 = TQString::tqfromLatin1( "text" ); - d->attrText2 = TQString::tqfromLatin1( "Text" ); - d->attrContext = TQString::tqfromLatin1( "context" ); + d->attrText1 = TQString::fromLatin1( "text" ); + d->attrText2 = TQString::fromLatin1( "Text" ); + d->attrContext = TQString::fromLatin1( "context" ); - d->attrIcon = TQString::tqfromLatin1( "icon" ); + d->attrIcon = TQString::fromLatin1( "icon" ); d->m_instance = 0; d->m_client = 0; @@ -146,7 +146,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // otherwise its shortcuts appear. TQWidget* p = parent; while ( p && !::qt_cast( p ) ) - p = p->tqparentWidget(); + p = p->parentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); @@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo TQDomAttr attr = attributes.item( i ).toAttr(); if ( attr.name().lower() == d->attrLineSeparator && - attr.value().lower() == TQString::tqfromLatin1("false") ) + attr.value().lower() == TQString::fromLatin1("false") ) { isLineSep = false; break; diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index e18b6ca8e..f857f3109 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const if ( !TQDir::isRelativePath(d->m_xmlFile) ) return TQString::null; // can't save anything here - return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); + return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); } @@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo { TQString doc; - TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file; + TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file; TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file ); @@ -190,10 +190,10 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo // let's treat this as if it isn't a problem and the user just // wants the global standards file - // however if a non-empty file gets passed and we can't tqfind it we might + // however if a non-empty file gets passed and we can't find it we might // inform the developer using some debug output if ( !_file.isEmpty() ) - kdWarning() << "KXMLGUIClient::setXMLFile: cannot tqfind .rc file " << _file << endl; + kdWarning() << "KXMLGUIClient::setXMLFile: cannot find .rc file " << _file << endl; setXML( TQString::null, true ); return; @@ -263,13 +263,13 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, static const TQString &attrOne = KGlobal::staticQString( "1" ); // there is a possibility that we don't want to merge in the - // additive.. rather, we might want to *tqreplace* the base with the + // additive.. rather, we might want to *replace* the base with the // additive. this can be for any container.. either at a file wide // level or a simple container level. we look for the 'noMerge' - // tag, in any event and just tqreplace the old with the new + // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.parentNode().tqreplaceChild(additive, base); + base.parentNode().replaceChild(additive, base); return true; } @@ -348,7 +348,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // first, see if this new element matches a standard one in // the global file. if it does, then we skip it as it will // be merged in, later - TQDomElement matchingElement = tqfindMatchingElement( newChild, base ); + TQDomElement matchingElement = findMatchingElement( newChild, base ); if ( matchingElement.isNull() || newChild.tagName() == tagSeparator ) base.insertBefore( newChild, e ); } @@ -368,7 +368,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, if ( tag == tagText ) continue; - TQDomElement matchingElement = tqfindMatchingElement( e, additive ); + TQDomElement matchingElement = findMatchingElement( e, additive ); if ( !matchingElement.isNull() ) { @@ -416,7 +416,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, if (e.isNull()) continue; - TQDomElement matchingElement = tqfindMatchingElement( e, base ); + TQDomElement matchingElement = findMatchingElement( e, base ); if ( matchingElement.isNull() ) { @@ -449,8 +449,8 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, if ( tag == tagAction ) { - // if base tqcontains an implemented action, then we must not get - // deleted (note that the actionCollection tqcontains both, + // if base contains an implemented action, then we must not get + // deleted (note that the actionCollection contains both, // "global" and "local" actions if ( actionCollection->action( e.attribute( attrName ).utf8() ) ) { @@ -499,7 +499,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, return deleteMe; } -TQDomElement KXMLGUIClient::tqfindMatchingElement( const TQDomElement &base, const TQDomElement &additive ) +TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive ) { static const TQString &tagAction = KGlobal::staticQString( "Action" ); static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); @@ -572,14 +572,14 @@ void KXMLGUIClient::insertChildClient( KXMLGUIClient *child ) void KXMLGUIClient::removeChildClient( KXMLGUIClient *child ) { - assert( d->m_children.tqcontainsRef( child ) ); + assert( d->m_children.containsRef( child ) ); d->m_children.removeRef( child ); child->d->m_parent = 0; } /*bool KXMLGUIClient::addSuperClient( KXMLGUIClient *super ) { - if ( d->m_supers.tqcontains( super ) ) + if ( d->m_supers.contains( super ) ) return false; d->m_supers.append( super ); return true; @@ -642,7 +642,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri TQValueList::Iterator docEnd = allDocuments.end(); for (; docIt != docEnd; ++docIt ) { - TQString versionStr = tqfindVersionNumber( (*docIt).data ); + TQString versionStr = findVersionNumber( (*docIt).data ); if ( versionStr.isEmpty() ) continue; @@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri else { TQString f = (*local).file; - TQString backup = f + TQString::tqfromLatin1( ".backup" ); + TQString backup = f + TQString::fromLatin1( ".backup" ); TQDir dir; dir.rename( f, backup ); } @@ -719,7 +719,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri -TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml ) +TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) { enum { ST_START, ST_AFTER_OPEN, ST_AFTER_GUI, ST_EXPECT_VERSION, ST_VERSION_NUM} state = ST_START; @@ -734,7 +734,7 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml ) case ST_AFTER_OPEN: { //Jump to gui.. - int guipos = xml.tqfind("gui", pos, false /*case-insensitive*/); + int guipos = xml.find("gui", pos, false /*case-insensitive*/); if (guipos == -1) return TQString::null; //Reject @@ -747,7 +747,7 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml ) break; case ST_EXPECT_VERSION: { - int verpos = xml.tqfind("version=\"", pos, false /*case-insensitive*/); + int verpos = xml.find("version=\"", pos, false /*case-insensitive*/); if (verpos == -1) return TQString::null; //Reject @@ -760,9 +760,9 @@ TQString KXMLGUIClient::tqfindVersionNumber( const TQString &xml ) unsigned int endpos; for (endpos = pos; endpos < xml.length(); endpos++) { - if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9') + if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9') continue; //Number.. - if (xml[endpos].tqunicode() == '"') //End of parameter + if (xml[endpos].unicode() == '"') //End of parameter break; else //This shouldn't be here.. { @@ -810,7 +810,7 @@ KXMLGUIClient::ActionPropertiesMap KXMLGUIClient::extractActionProperties( const if ( actionName.isEmpty() ) continue; - TQMap >::Iterator propIt = properties.tqfind( actionName ); + TQMap >::Iterator propIt = properties.find( actionName ); if ( propIt == properties.end() ) propIt = properties.insert( actionName, TQMap() ); @@ -874,7 +874,7 @@ void KXMLGUIClient::addStateActionEnabled(const TQString& state, stateChange.actionsToEnable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionEnabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.tqreplace( state, stateChange ); + m_actionsStateMap.replace( state, stateChange ); } @@ -886,7 +886,7 @@ void KXMLGUIClient::addStateActionDisabled(const TQString& state, stateChange.actionsToDisable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionDisabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.tqreplace( state, stateChange ); + m_actionsStateMap.replace( state, stateChange ); } diff --git a/kdeui/kxmlguiclient.h b/kdeui/kxmlguiclient.h index a4b903028..f3f7393f4 100644 --- a/kdeui/kxmlguiclient.h +++ b/kdeui/kxmlguiclient.h @@ -102,7 +102,7 @@ public: /** * @return The parsed XML in a TQDomDocument, set by * setXMLFile() or setXML(). - * This document describes the tqlayout of the GUI. + * This document describes the layout of the GUI. */ virtual TQDomDocument domDocument() const; @@ -304,7 +304,7 @@ protected: virtual void setXML( const TQString &document, bool merge = false ); /** - * Sets the Document for the part, describing the tqlayout of the GUI. + * Sets the Document for the part, describing the layout of the GUI. * * Call this in the Part-inherited class constructor if you don't call * setXMLFile or setXML . @@ -344,7 +344,7 @@ private: bool mergeXML( TQDomElement &base, const TQDomElement &additive, KActionCollection *actionCollection ); - TQDomElement tqfindMatchingElement( const TQDomElement &base, + TQDomElement findMatchingElement( const TQDomElement &base, const TQDomElement &additive ); typedef TQMap > ActionPropertiesMap; @@ -353,7 +353,7 @@ private: static void storeActionProperties( TQDomDocument &doc, const ActionPropertiesMap &properties ); - static TQString tqfindVersionNumber( const TQString &_xml ); + static TQString findVersionNumber( const TQString &_xml ); // Actions to enable/disable on a state change TQMap m_actionsStateMap; diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp index 59f7202d6..c166df861 100644 --- a/kdeui/kxmlguifactory.cpp +++ b/kdeui/kxmlguifactory.cpp @@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu xml_file = filename; else { - xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename); + xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename); if ( !TQFile::exists( xml_file ) ) xml_file = locate( "data", filename ); } @@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu { kdError(240) << "No such XML file " << filename << endl; if ( never_null ) - return TQString::tqfromLatin1( "\n\n" ); + return TQString::fromLatin1( "\n\n" ); else return TQString::null; } @@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) - xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + filename); TQFile file( xml_file ); @@ -240,7 +240,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client ) d->guiClient = client; // add this client to our client list - if ( !d->m_clients.tqcontainsRef( client ) ) + if ( !d->m_clients.containsRef( client ) ) d->m_clients.append( client ); else kdDebug(1002) << "XMLGUI client already added " << client << endl; @@ -251,7 +251,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client ) client->beginXMLPlug( d->builder->widget() ); // try to use the build document for building the client's GUI, as the build document - // tqcontains the correct container state information (like toolbar positions, sizes, etc.) . + // contains the correct container state information (like toolbar positions, sizes, etc.) . // if there is non available, then use the "real" document. TQDomDocument doc = client->xmlguiBuildDocument(); if ( doc.documentElement().isNull() ) @@ -388,7 +388,7 @@ TQWidget *KXMLGUIFactory::container( const TQString &containerName, KXMLGUIClien d->m_containerName = containerName; d->guiClient = client; - TQWidget *result = tqfindRecursive( d->m_rootNode, useTagName ); + TQWidget *result = findRecursive( d->m_rootNode, useTagName ); d->guiClient = 0L; d->m_containerName = TQString::null; @@ -400,7 +400,7 @@ TQWidget *KXMLGUIFactory::container( const TQString &containerName, KXMLGUIClien TQPtrList KXMLGUIFactory::containers( const TQString &tagName ) { - return tqfindRecursive( d->m_rootNode, tagName ); + return findRecursive( d->m_rootNode, tagName ); } void KXMLGUIFactory::reset() @@ -415,7 +415,7 @@ void KXMLGUIFactory::resetContainer( const TQString &containerName, bool useTagN if ( containerName.isEmpty() ) return; - ContainerNode *container = d->m_rootNode->tqfindContainer( containerName, useTagName ); + ContainerNode *container = d->m_rootNode->findContainer( containerName, useTagName ); if ( !container ) return; @@ -429,7 +429,7 @@ void KXMLGUIFactory::resetContainer( const TQString &containerName, bool useTagN parent->removeChild( container ); } -TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool tag ) +TQWidget *KXMLGUIFactory::findRecursive( KXMLGUI::ContainerNode *node, bool tag ) { if ( ( ( !tag && node->name == d->m_containerName ) || ( tag && node->tagName == d->m_containerName ) ) && @@ -439,7 +439,7 @@ TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool ta TQPtrListIterator it( node->children ); for (; it.current(); ++it ) { - TQWidget *cont = tqfindRecursive( it.current(), tag ); + TQWidget *cont = findRecursive( it.current(), tag ); if ( cont ) return cont; } @@ -447,7 +447,7 @@ TQWidget *KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, bool ta return 0L; } -TQPtrList KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *node, +TQPtrList KXMLGUIFactory::findRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName ) { TQPtrList res; @@ -458,7 +458,7 @@ TQPtrList KXMLGUIFactory::tqfindRecursive( KXMLGUI::ContainerNode *nod TQPtrListIterator it( node->children ); for (; it.current(); ++it ) { - TQPtrList lst = tqfindRecursive( it.current(), tagName ); + TQPtrList lst = findRecursive( it.current(), tagName ); TQPtrListIterator wit( lst ); for (; wit.current(); ++wit ) res.append( wit.current() ); @@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) { - const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties"); + const TQString tagActionProp = TQString::fromLatin1("ActionProperties"); // first, lets see if we have existing properties TQDomElement elem; TQDomNode it = doc.documentElement().firstChild(); @@ -586,7 +586,7 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) return elem; } -TQDomElement KXMLGUIFactory::tqfindActionByName( TQDomElement& elem, const TQString& sName, bool create ) +TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create ) { static const TQString& attrName = KGlobal::staticQString( "name" ); static const TQString& tagAction = KGlobal::staticQString( "Action" ); diff --git a/kdeui/kxmlguifactory.h b/kdeui/kxmlguifactory.h index 0a1b30deb..fa534e093 100644 --- a/kdeui/kxmlguifactory.h +++ b/kdeui/kxmlguifactory.h @@ -52,14 +52,14 @@ class BuildHelper; * and merging the GUI from an unlimited number of clients. * * Each client provides XML through a TQDomDocument and actions through a - * KActionCollection . The XML document tqcontains the rules for how to merge the + * KActionCollection . The XML document contains the rules for how to merge the * GUI. * * KXMLGUIFactory processes the DOM tree provided by a client and plugs in the client's actions, * according to the XML and the merging rules of previously inserted clients. Container widgets * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor. */ -class KDEUI_EXPORT KXMLGUIFactory : public TQObject +class KDEUI_EXPORT KXMLGUIFactory : public QObject { friend class KXMLGUI::BuildHelper; Q_OBJECT @@ -103,7 +103,7 @@ class KDEUI_EXPORT KXMLGUIFactory : public TQObject * Find or create the element for a given action, by name. * Used when saving custom action properties */ - static TQDomElement tqfindActionByName( TQDomElement& elem, const TQString& sName, bool create ); + static TQDomElement findActionByName( TQDomElement& elem, const TQString& sName, bool create ); /** * Creates the GUI described by the TQDomDocument of the client, @@ -201,9 +201,9 @@ class KDEUI_EXPORT KXMLGUIFactory : public TQObject private: - TQWidget *tqfindRecursive( KXMLGUI::ContainerNode *node, bool tag ); + TQWidget *findRecursive( KXMLGUI::ContainerNode *node, bool tag ); - TQPtrList tqfindRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName ); + TQPtrList findRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName ); void applyActionProperties( const TQDomElement &element ); void configureAction( KAction *action, const TQDomNamedNodeMap &attributes ); diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp index f4e7459b7..4bd5ad68e 100644 --- a/kdeui/kxmlguifactory_p.cpp +++ b/kdeui/kxmlguifactory_p.cpp @@ -64,16 +64,16 @@ ContainerNode::ContainerNode( TQWidget *_container, const TQString &_tagName, void ContainerNode::removeChild( ContainerNode *child ) { - MergingIndexList::Iterator mergingIt = tqfindIndex( child->mergingName ); + MergingIndexList::Iterator mergingIt = findIndex( child->mergingName ); adjustMergingIndices( -1, mergingIt ); children.removeRef( child ); } /* - * Find a merging index with the given name. Used to tqfind an index defined by + * Find a merging index with the given name. Used to find an index defined by * or by a tag. */ -MergingIndexList::Iterator ContainerNode::tqfindIndex( const TQString &name ) +MergingIndexList::Iterator ContainerNode::findIndex( const TQString &name ) { MergingIndexList::Iterator it( mergingIndices.begin() ); MergingIndexList::Iterator end( mergingIndices.end() ); @@ -87,7 +87,7 @@ MergingIndexList::Iterator ContainerNode::tqfindIndex( const TQString &name ) * Check if the given container widget is a child of this node and return the node structure * if fonud. */ -ContainerNode *ContainerNode::tqfindContainerNode( TQWidget *container ) +ContainerNode *ContainerNode::findContainerNode( TQWidget *container ) { ContainerNodeListIt it( children ); @@ -103,7 +103,7 @@ ContainerNode *ContainerNode::tqfindContainerNode( TQWidget *container ) * container's tag name or the value of the container's name attribute. Specified by * the tag bool . */ -ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag ) +ContainerNode *ContainerNode::findContainer( const TQString &_name, bool tag ) { if ( ( tag && tagName == _name ) || ( !tag && name == _name ) ) @@ -112,7 +112,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag ) ContainerNodeListIt it( children ); for (; it.current(); ++it ) { - ContainerNode *res = it.current()->tqfindContainer( _name, tag ); + ContainerNode *res = it.current()->findContainer( _name, tag ); if ( res ) return res; } @@ -125,7 +125,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &_name, bool tag ) * leaves out container widgets specified in the exludeList . Also ensures that the containers * belongs to currClient. */ -ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQString &tagName, +ContainerNode *ContainerNode::findContainer( const TQString &name, const TQString &tagName, const TQPtrList *excludeList, KXMLGUIClient * /*currClient*/ ) { @@ -136,7 +136,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr { for (; nIt.current(); ++nIt ) if ( nIt.current()->name == name && - !excludeList->tqcontainsRef( nIt.current()->container ) ) + !excludeList->containsRef( nIt.current()->container ) ) { res = nIt.current(); break; @@ -149,7 +149,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr for (; nIt.current(); ++nIt ) { if ( nIt.current()->tagName == tagName && - !excludeList->tqcontainsRef( nIt.current()->container ) + !excludeList->containsRef( nIt.current()->container ) /* * It is a bad idea to also compare the client, because * we don't want to do so in situations like these: @@ -175,7 +175,7 @@ ContainerNode *ContainerNode::tqfindContainer( const TQString &name, const TQStr return res; } -ContainerClient *ContainerNode::tqfindChildContainerClient( KXMLGUIClient *currentGUIClient, +ContainerClient *ContainerNode::findChildContainerClient( KXMLGUIClient *currentGUIClient, const TQString &groupName, const MergingIndexList::Iterator &mergingIdx ) { @@ -226,7 +226,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I TQString k( mergingIdx.mergingName ); - if ( k.tqfind( tagActionList ) == -1 ) + if ( k.find( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -237,7 +237,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I if ( k != state.actionListName ) return; - ContainerClient *client = tqfindChildContainerClient( state.guiClient, + ContainerClient *client = findChildContainerClient( state.guiClient, TQString::null, mergingIndices.end() ); @@ -268,7 +268,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString k = mergingIdx.mergingName; - if ( k.tqfind( tagActionList ) == -1 ) + if ( k.find( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -279,11 +279,11 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: if ( k != state.actionListName ) return; - ContainerClient *client = tqfindChildContainerClient( state.guiClient, + ContainerClient *client = findChildContainerClient( state.guiClient, TQString::null, mergingIndices.end() ); - ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) ); + ActionListMap::Iterator lIt( client->actionLists.find( k ) ); if ( lIt == client->actionLists.end() ) return; @@ -352,7 +352,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s { ContainerNode *childNode = childIt.current(); - TQDomElement childElement = tqfindElementForChild( element, childNode ); + TQDomElement childElement = findElementForChild( element, childNode ); // destruct returns true in case the container really got deleted if ( childNode->destruct( childElement, state ) ) @@ -362,7 +362,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s } } -TQDomElement ContainerNode::tqfindElementForChild( const TQDomElement &baseElement, +TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ) { static const TQString &attrName = KGlobal::staticQString( "name" ); @@ -427,7 +427,7 @@ void ContainerNode::unplugClient( ContainerClient *client ) // now adjust all merging indices - MergingIndexList::Iterator mergingIt = tqfindIndex( client->mergingName ); + MergingIndexList::Iterator mergingIt = findIndex( client->mergingName ); adjustMergingIndices( - int( client->actions.count() + client->customElements.count() ), @@ -441,12 +441,12 @@ void ContainerNode::unplugClient( ContainerClient *client ) { alIt.data().unplug( container ); - // construct the merging index key (i.e. like named merging) , tqfind the + // construct the merging index key (i.e. like named merging) , find the // corresponding merging index and adjust all indices TQString mergingKey = alIt.key(); mergingKey.prepend( tagActionList ); - MergingIndexList::Iterator mIt = tqfindIndex( mergingKey ); + MergingIndexList::Iterator mIt = findIndex( mergingKey ); if ( mIt == mergingIndices.end() ) continue; @@ -476,9 +476,9 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName, MergingIndexList::Iterator mergingIt; if ( mergingName.isEmpty() ) - mergingIt = tqfindIndex( state.clientName ); + mergingIt = findIndex( state.clientName ); else - mergingIt = tqfindIndex( mergingName ); + mergingIt = findIndex( mergingName ); MergingIndexList::Iterator mergingEnd = mergingIndices.end(); it = mergingEnd; @@ -538,7 +538,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) containerTags = m_state.clientBuilderContainerTags + containerTags; } - m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName ); + m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, m_state, /*ignoreDefaultMergingIndex*/ false ); } @@ -568,9 +568,9 @@ void BuildHelper::processElement( const TQDomElement &e ) bool isActionTag = ( tag == tagAction ); - if ( isActionTag || customTags.tqfindIndex( tag ) != -1 ) + if ( isActionTag || customTags.findIndex( tag ) != -1 ) processActionOrCustomElement( e, isActionTag ); - else if ( containerTags.tqfindIndex( tag ) != -1 ) + else if ( containerTags.findIndex( tag ) != -1 ) processContainerElement( e, tag, currName ); else if ( tag == tagMerge || tag == tagDefineGroup || tag == tagActionList ) processMergeElement( tag, currName, e ); @@ -588,7 +588,7 @@ void BuildHelper::processActionOrCustomElement( const TQDomElement &e, bool isAc TQString group; int idx = calcMergingIndex( e, it, group ); - containerClient = parentNode->tqfindChildContainerClient( m_state.guiClient, group, it ); + containerClient = parentNode->findChildContainerClient( m_state.guiClient, group, it ); bool guiElementCreated = false; if ( isActionTag ) @@ -697,7 +697,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name else if ( tag == tagActionList ) mergingName.prepend( tagActionList ); - if ( parentNode->tqfindIndex( mergingName ) != parentNode->mergingIndices.end() ) + if ( parentNode->findIndex( mergingName ) != parentNode->mergingIndices.end() ) return; //do not allow the redefinition of merging indices! MergingIndexList::Iterator mIt( parentNode->mergingIndices.end() ); @@ -726,7 +726,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name ignoreDefaultMergingIndex = true; // re-calculate the running default and client merging indices. - m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName ); + m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, m_state, ignoreDefaultMergingIndex ); } @@ -736,7 +736,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString { static const TQString &defaultMergingName = KGlobal::staticQString( "" ); - ContainerNode *containerNode = parentNode->tqfindContainer( name, tag, + ContainerNode *containerNode = parentNode->findContainer( name, tag, &containerList, m_state.guiClient ); @@ -759,7 +759,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString parentNode->adjustMergingIndices( 1, it ); - assert( !parentNode->tqfindContainerNode( container ) ); + assert( !parentNode->findContainerNode( container ) ); containerList.append( container ); @@ -783,7 +783,7 @@ void BuildHelper::processContainerElement( const TQDomElement &e, const TQString BuildHelper( m_state, containerNode ).build( e ); // and re-calculate running values, for better performance - m_state.currentDefaultMergingIt = parentNode->tqfindIndex( defaultMergingName ); + m_state.currentDefaultMergingIt = parentNode->findIndex( defaultMergingName ); parentNode->calcMergingIndex( TQString::null, m_state.currentClientMergingIt, m_state, ignoreDefaultMergingIndex ); } diff --git a/kdeui/kxmlguifactory_p.h b/kdeui/kxmlguifactory_p.h index 440353ea1..1877a295f 100644 --- a/kdeui/kxmlguifactory_p.h +++ b/kdeui/kxmlguifactory_p.h @@ -99,7 +99,7 @@ typedef TQValueList MergingIndexList; * is shared all over the place, so there's no need to worry about memory consumption for these * variables :-) * - * The mergingIndices list tqcontains the merging indices ;-) , as defined by , + * The mergingIndices list contains the merging indices ;-) , as defined by , * or by tags. The order of these index structures within the mergingIndices list * is (and has to be) identical with the order in the DOM tree. * @@ -141,14 +141,14 @@ struct KDEUI_EXPORT ContainerNode void clearChildren() { children.clear(); } void removeChild( ContainerNode *child ); - MergingIndexList::Iterator tqfindIndex( const TQString &name ); - ContainerNode *tqfindContainerNode( TQWidget *container ); - ContainerNode *tqfindContainer( const TQString &_name, bool tag ); - ContainerNode *tqfindContainer( const TQString &name, const TQString &tagName, + MergingIndexList::Iterator findIndex( const TQString &name ); + ContainerNode *findContainerNode( TQWidget *container ); + ContainerNode *findContainer( const TQString &_name, bool tag ); + ContainerNode *findContainer( const TQString &name, const TQString &tagName, const TQPtrList *excludeList, KXMLGUIClient *currClient ); - ContainerClient *tqfindChildContainerClient( KXMLGUIClient *currentGUIClient, + ContainerClient *findChildContainerClient( KXMLGUIClient *currentGUIClient, const TQString &groupName, const MergingIndexList::Iterator &mergingIdx ); @@ -162,7 +162,7 @@ struct KDEUI_EXPORT ContainerNode bool destruct( TQDomElement element, BuildState &state ); void destructChildren( const TQDomElement &element, BuildState &state ); - static TQDomElement tqfindElementForChild( const TQDomElement &baseElement, + static TQDomElement findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ); void unplugActions( BuildState &state ); void unplugClient( ContainerClient *client ); diff --git a/kdeui/preparetips b/kdeui/preparetips index e69e11255..baeaaf3b4 100755 --- a/kdeui/preparetips +++ b/kdeui/preparetips @@ -14,10 +14,10 @@ sub printText if ( $text cmp "" ) { - # tqreplace \ with \\ + # replace \ with \\ $text =~ s/\\/\\\\/g; - # tqreplace " with \" + # replace " with \" $text =~ s/"/\\"/g; print "\"$text\\n\"\n"; diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 422a424ff..7ec1db3a2 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -150,10 +150,10 @@ namespace { // L0200: This application wide event filter handles focus // issues in the embedded client. - class QXEmbedAppFilter : public TQObject + class QXEmbedAppFilter : public QObject { public: - QXEmbedAppFilter() { tqApp->installEventFilter( this ); } + QXEmbedAppFilter() { qApp->installEventFilter( this ); } ~QXEmbedAppFilter() { } bool eventFilter( TQObject *, TQEvent * ); }; @@ -169,7 +169,7 @@ static XKeyEvent last_key_event; // L0300: This class gives access protected members of class TQWidget. // Function focusData() is useful to reimplement tab focus management // (L0620) Function topData() returns a structure QTLWExtra containing -// information unique to toplevel windows. This structure tqcontains two +// information unique to toplevel windows. This structure contains two // members for the sole use of QXEmbed. Flag `embedded' indicates whether // the toplevel window is embedded using the XEMBED protocol (L0680). // Handle `parentWinId' then records the id of the embedding window. @@ -311,8 +311,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( tqApp->tqfocusWidget() == o && - ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { + if ( qApp->focusWidget() == o && + ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || fe->reason() == TQFocusEvent::Shortcut*/ ) { @@ -320,8 +320,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // Variable `obeyFocus' suggests that this is the result of mouse // activity in the client. The XEMBED_REQUEST_FOCUS message causes // the embedding widget to take the Qt focus (L2085). - WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId; - focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); + WId window = ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->parentWinId; + focusMap->remove( qApp->focusWidget()->topLevelWidget() ); sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) { // L0615: Both the embedder and the embedded client became active. @@ -329,21 +329,21 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // So we clear the Qt focus for now. If indeed the QXEmbed widget // has the focus, it will receive a FocusIn message (L1530) and // tell us to restore the focus (L0680, L0683). - focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); - focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(), - new TQGuardedPtr(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) ); - // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be - // equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ! - tqApp->tqfocusWidget()->clearFocus(); + focusMap->remove( qApp->focusWidget()->topLevelWidget() ); + focusMap->insert( qApp->focusWidget()->topLevelWidget(), + new TQGuardedPtr(qApp->focusWidget()->topLevelWidget()->focusWidget() ) ); + // L0616: qApp->focusWidget() might belong to a modal dialog and not be + // equal to qApp->focusWidget()->topLevelWidget()->focusWidget() ! + qApp->focusWidget()->clearFocus(); // L0617: ??? [why not {obeyFocus=false; return true;} here?] } obeyFocus = false; } break; case TQEvent::KeyPress: - if (tqApp->tqfocusWidget() == o && - ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { - // L0620: The following code tqreplaces the Qt code that + if (qApp->focusWidget() == o && + ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { + // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the // XEMBED specification for details. The keypress event // arrives here after an interesting itinerary. It is first @@ -356,7 +356,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // (L0653, L0654) which then performs tab navigation // (L2081). TQKeyEvent *k = (TQKeyEvent *)e; - TQWidget *w = tqApp->tqfocusWidget(); + TQWidget *w = qApp->focusWidget(); // L0621: The following tests are copied from TQWidget::event(). bool res = false; bool tabForward = true; @@ -375,16 +375,16 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // L0625: We changed the focus because of tab/backtab key // Now check whether we have been looping around. TQFocusData *fd = ((QPublicWidget*)w)->focusData(); - WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId; + WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId; TQWidget *cw = 0; TQWidget *fw = fd->home(); if (tabForward && window) { - while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) + while (cw != w && cw != fw && cw != w->topLevelWidget()) cw = fd->prev(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_NEXT ); } else if (window) { - while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) + while (cw != w && cw != fw && cw != w->topLevelWidget()) cw = fd->next(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_PREV ); @@ -422,16 +422,16 @@ static int qxembed_x11_event_filter( XEvent* e) // L0671: Keep Qt message time up to date if ( msgtime > qt_x_time ) qt_x_time = msgtime; - TQWidget* w = TQWidget::tqfind( e->xclient.window ); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; switch ( message) { case XEMBED_EMBEDDED_NOTIFY: { // L0675: We just have been embedded into a XEMBED aware widget. - QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData(); + QTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData(); extra->embedded = 1; extra->parentWinId = e->xclient.data.l[3]; - w->tqtopLevelWidget()->show(); + w->topLevelWidget()->show(); break; } case XEMBED_WINDOW_ACTIVATE: { @@ -444,10 +444,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusIn; - ev.xfocus.window = w->tqtopLevelWidget()->winId(); + ev.xfocus.window = w->topLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - tqApp->x11ProcessEvent( &ev ); + qApp->x11ProcessEvent( &ev ); } break; case XEMBED_WINDOW_DEACTIVATE: { @@ -458,10 +458,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusOut; - ev.xfocus.window = w->tqtopLevelWidget()->winId(); + ev.xfocus.window = w->topLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - tqApp->x11ProcessEvent( &ev ); + qApp->x11ProcessEvent( &ev ); } break; case XEMBED_FOCUS_IN: @@ -469,11 +469,11 @@ static int qxembed_x11_event_filter( XEvent* e) { // L0681: Search saved focus widget. TQWidget* focusCurrent = 0; - TQGuardedPtr* fw = focusMap->tqfind( w->tqtopLevelWidget() ); + TQGuardedPtr* fw = focusMap->find( w->topLevelWidget() ); if ( fw ) { focusCurrent = *fw; // L0682: Remove it from the map - focusMap->remove( w->tqtopLevelWidget() ); + focusMap->remove( w->topLevelWidget() ); } switch ( detail ) { case XEMBED_FOCUS_CURRENT: @@ -483,15 +483,15 @@ static int qxembed_x11_event_filter( XEvent* e) if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent )) emb->updateEmbeddedFocus( true ); } - else if ( !w->tqtopLevelWidget()->tqfocusWidget() ) - w->tqtopLevelWidget()->setFocus(); + else if ( !w->topLevelWidget()->focusWidget() ) + w->topLevelWidget()->setFocus(); break; case XEMBED_FOCUS_FIRST: { // L0684: Search first widget in tab chain TQFocusEvent::setReason( TQFocusEvent::Tab ); - w->tqtopLevelWidget()->setFocus(); - ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true); + w->topLevelWidget()->setFocus(); + ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true); TQFocusEvent::resetReason(); } break; @@ -499,8 +499,8 @@ static int qxembed_x11_event_filter( XEvent* e) { // L0686: Search last widget in tab chain TQFocusEvent::setReason( TQFocusEvent::Backtab ); - w->tqtopLevelWidget()->setFocus(); - ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false); + w->topLevelWidget()->setFocus(); + ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false); TQFocusEvent::resetReason(); } break; @@ -513,12 +513,12 @@ static int qxembed_x11_event_filter( XEvent* e) // L0688: Embedding application takes the focus away // We first record what the focus widget was // and clear the Qt focus. - if ( w->tqtopLevelWidget()->tqfocusWidget() ) { - if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget())) + if ( w->topLevelWidget()->focusWidget() ) { + if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget())) emb->updateEmbeddedFocus( false ); - focusMap->insert( w->tqtopLevelWidget(), - new TQGuardedPtr(w->tqtopLevelWidget()->tqfocusWidget() ) ); - w->tqtopLevelWidget()->tqfocusWidget()->clearFocus(); + focusMap->insert( w->topLevelWidget(), + new TQGuardedPtr(w->topLevelWidget()->focusWidget() ) ); + w->topLevelWidget()->focusWidget()->clearFocus(); } break; default: @@ -526,7 +526,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == qt_wm_protocols ) { - TQWidget* w = TQWidget::tqfind( e->xclient.window ); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; // L0690: This is for the embedding side! @@ -621,7 +621,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // whole embedding application. They compete between themselves and // against Qt (L0690, L0914, L1040, L1310, L1510, L1580). // This would be much simpler if implemented within Qt. - d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" ); + d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" ); d->focusProxy->setGeometry( -1, -1, 1, 1 ); d->focusProxy->show(); // make sure it's shown - for XSetInputFocus @@ -656,13 +656,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // L0913: all application events pass through eventFilter(). // This is mostly used to force the X11 focus on the // proxy focus window. See L1300. - tqtopLevelWidget()->installEventFilter( this ); - tqApp->installEventFilter( this ); + topLevelWidget()->installEventFilter( this ); + qApp->installEventFilter( this ); // L0914: Start moving the X11 focus on the focus proxy window. // See L1581 to know why we do not use isActiveWindow(). - if ( tqApp->activeWindow() == tqtopLevelWidget() ) - if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( qApp->activeWindow() == topLevelWidget() ) + if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); // L0915: ??? [drag&drop?] @@ -682,7 +682,7 @@ QXEmbed::~QXEmbed() // with this QXEmbed's window. #if 0 // TODO: The proper XEmbed way would be to unmap the window, and the embedded -// app would detect the embedding has ended, and do whatever it tqfinds appropriate. +// app would detect the embedding has ended, and do whatever it finds appropriate. // However, QXEmbed currently doesn't provide support for this detection, // so for the time being, it's better to leave the window mapped as toplevel window. // This will be ever more complicated with the systray windows, as the simple API @@ -716,7 +716,7 @@ QXEmbed::~QXEmbed() int revert; XGetInputFocus( qt_xdisplay(), &focus, &revert ); if( focus == d->focusProxy->winId()) - XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, qt_x_time ); + XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, qt_x_time ); // L01045: Delete our private data. delete d; } @@ -780,10 +780,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( o == tqtopLevelWidget() ) { + if ( o == topLevelWidget() ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. - if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) if (! hasFocus() ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); @@ -796,7 +796,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( o == tqtopLevelWidget() ) { + if ( o == topLevelWidget() ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -808,8 +808,8 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( pos != o && pos != tqtopLevelWidget()) - pos = pos->tqparentWidget(); + while( pos != o && pos != topLevelWidget()) + pos = pos->parentWidget(); if( pos == o ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. @@ -864,8 +864,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){ return; // L1510: This is a good time to set the X11 focus on the focus proxy window. // Except if the the embedding application itself is embedded into another. - if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) - if ( tqApp->activeWindow() == tqtopLevelWidget() ) + if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( qApp->activeWindow() == topLevelWidget() ) // L1511: Alter X focus only when window is active. // This is dual safety here because FocusIn implies this. // But see L1581 for an example where this really matters. @@ -913,8 +913,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){ // is properly set to the X11 focus widget. We do this because // the client application might have moved the X11 focus after // receiving the fake focus messages. - if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) - if ( tqApp->activeWindow() == tqtopLevelWidget() ) + if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( qApp->activeWindow() == topLevelWidget() ) // L1581: Alter X focus only when window is active. // The test above is not the same as isActiveWindow(). // Function isActiveWindow() also returns true when a modal @@ -950,7 +950,7 @@ static bool wstate_withdrawn( WId winid ) // L1610: Non managed windows have no WM_STATE property. // Returning true ensures that the loop L1711 stops. if ( r == Success && data && format == 32 ) { - TQ_UINT32 *wstate = (TQ_UINT32*)data; + Q_UINT32 *wstate = (Q_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1046,8 +1046,8 @@ void QXEmbed::handleEmbed() if ( parent() ) { // L2030: embedded window might have new size requirements. // see L2500, L2520, L2550. - TQEvent * tqlayoutHint = new TQEvent( TQEvent::LayoutHint ); - TQApplication::postEvent( parent(), tqlayoutHint ); + TQEvent * layoutHint = new TQEvent( TQEvent::LayoutHint ); + TQApplication::postEvent( parent(), layoutHint ); } windowChanged( window ); if (d->xplain) { @@ -1176,10 +1176,10 @@ bool QXEmbed::x11Event( XEvent* e) break; // L2085: The client asks for the focus. case XEMBED_REQUEST_FOCUS: - if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) { - focusMap->remove( tqtopLevelWidget() ); - focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr( this )); - WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId; + if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) { + focusMap->remove( topLevelWidget() ); + focusMap->insert( topLevelWidget(), new TQGuardedPtr( this )); + WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId; sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else { TQFocusEvent::setReason( TQFocusEvent::Mouse ); @@ -1194,7 +1194,7 @@ bool QXEmbed::x11Event( XEvent* e) break; case ConfigureRequest: - // L2090: Client wants to change its tqgeometry. + // L2090: Client wants to change its geometry. // Just inform it that nothing has changed. if (e->xconfigurerequest.window == window) { @@ -1285,7 +1285,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) // L2500: Specifies that this widget can use additional space, -// and that it can survive on less than tqsizeHint(). +// and that it can survive on less than sizeHint(). TQSizePolicy QXEmbed::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -1293,13 +1293,13 @@ TQSizePolicy QXEmbed::sizePolicy() const // L2520: Returns a size sufficient for the embedded window -TQSize QXEmbed::tqsizeHint() const +TQSize QXEmbed::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } // L2550: Returns the minimum size specified by the embedded window. -TQSize QXEmbed::tqminimumSizeHint() const +TQSize QXEmbed::minimumSizeHint() const { int minw = 0; int minh = 0; @@ -1356,7 +1356,7 @@ void QXEmbed::checkGrab() } // L2900: This sends fake configure notify events to inform -// the client about its window tqgeometry. See L1390, L2024 and L2090. +// the client about its window geometry. See L1390, L2024 and L2090. void QXEmbed::sendSyntheticConfigureNotifyEvent() { // L2910: It seems that the x and y coordinates are global. diff --git a/kdeui/qxembed.h b/kdeui/qxembed.h index 2d1d92baa..3b345554f 100644 --- a/kdeui/qxembed.h +++ b/kdeui/qxembed.h @@ -183,8 +183,8 @@ public: bool autoDelete() const; /* Reimp */ - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; TQSizePolicy sizePolicy() const; bool eventFilter( TQObject *, TQEvent * ); bool customWhatsThis() const; diff --git a/kdeui/tests/kblendtest.cpp b/kdeui/tests/kblendtest.cpp index 59a57dc6a..e2d36a575 100644 --- a/kdeui/tests/kblendtest.cpp +++ b/kdeui/tests/kblendtest.cpp @@ -11,7 +11,7 @@ KBlendWidget::KBlendWidget(TQWidget *parent, const char *name) :TQWidget(parent, name) { - bgnd = tqRgb(255, 255, 255); + bgnd = qRgb(255, 255, 255); image = TQImage("testimage.png"); diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp index 80b4661cc..1773c47f9 100644 --- a/kdeui/tests/kbuttonboxtest.cpp +++ b/kdeui/tests/kbuttonboxtest.cpp @@ -37,8 +37,8 @@ int main(int argc, char **argv) { "the window!\n" "Press OK or Cancel when done" , w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); @@ -50,7 +50,7 @@ int main(int argc, char **argv) { bbox->addStretch(1); bbox->addButton("Help"); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); @@ -65,8 +65,8 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -76,7 +76,7 @@ int main(int argc, char **argv) { w, TQT_SLOT(accept())); w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), w, TQT_SLOT(accept())); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); @@ -91,8 +91,8 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -103,7 +103,7 @@ int main(int argc, char **argv) { w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), w, TQT_SLOT(accept())); bbox->addStretch(1); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); @@ -120,8 +120,8 @@ int main(int argc, char **argv) { "the maximum width for all buttons\n" "since it will look ugly -- " "anyway, it works", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -134,7 +134,7 @@ int main(int argc, char **argv) { bbox->addButton("Push me and I give you a banana"); bbox->addStretch(1); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); @@ -152,8 +152,8 @@ int main(int argc, char **argv) { "prevent this strange effect as seen\n" "the former example!" ,w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -166,7 +166,7 @@ int main(int argc, char **argv) { bbox->addButton("Push me and I give you a banana", true); bbox->addStretch(1); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); @@ -182,8 +182,8 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); @@ -194,7 +194,7 @@ int main(int argc, char **argv) { w, TQT_SLOT(accept())); bbox->addStretch(1); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox,0); tl->activate(); w->exec(); diff --git a/kdeui/tests/kcharselecttest.cpp b/kdeui/tests/kcharselecttest.cpp index 5880c436a..facd17bca 100644 --- a/kdeui/tests/kcharselecttest.cpp +++ b/kdeui/tests/kcharselecttest.cpp @@ -7,7 +7,7 @@ int main (int argc,char **argv) KApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); - selector.resize( selector.tqsizeHint() ); + selector.resize( selector.sizeHint() ); selector.show(); selector.setCaption( "KCharSelect Test" ); diff --git a/kdeui/tests/kcolortest.cpp b/kdeui/tests/kcolortest.cpp index 46f5b42bc..d4a5c2625 100644 --- a/kdeui/tests/kcolortest.cpp +++ b/kdeui/tests/kcolortest.cpp @@ -51,9 +51,9 @@ void KColorWidget::doIntensityLoop() for (int i=0;isetSpacing (KDialog::spacingHint()); TQLabel* lbl = new TQLabel("&QCombobox:", hbox); - lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); @@ -48,7 +48,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Read-Only Combo:", hbox); - lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); @@ -61,7 +61,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Editable Combo:", hbox); - lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_rw = new KComboBox( true, hbox, "ReadWriteCombo" ); lbl->setBuddy (m_rw); @@ -78,7 +78,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&History Combo:", hbox); - lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_hc = new KHistoryCombo( true, hbox, "HistoryCombo" ); lbl->setBuddy (m_hc); @@ -94,7 +94,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel( "&Konq's Combo:", hbox); - lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp index b38ec8095..bdd47ab48 100644 --- a/kdeui/tests/kcompletiontest.cpp +++ b/kdeui/tests/kcompletiontest.cpp @@ -39,10 +39,10 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1 = new TQGroupBox( this, "GroupBox1" ); GroupBox1->setTitle( "Completion Test" ); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->tqlayout()->setSpacing( 0 ); - GroupBox1->tqlayout()->setMargin( 0 ); - GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() ); - GroupBox1Layout->tqsetAlignment( Qt::AlignTop ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); + GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); + GroupBox1Layout->setAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); @@ -166,7 +166,7 @@ void Form1::slotList() void Form1::slotHighlighted( const TQString& text ) { // remove any "weighting" - int index = text.tqfindRev( ':' ); + int index = text.findRev( ':' ); if ( index > 0 ) LineEdit1->setText( text.left( index ) ); else diff --git a/kdeui/tests/kdesattest.cpp b/kdeui/tests/kdesattest.cpp index e75b320a7..28f7d4cf2 100644 --- a/kdeui/tests/kdesattest.cpp +++ b/kdeui/tests/kdesattest.cpp @@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) void KDesatWidget::change(double) { desat_value = slide->value(); - tqrepaint(false); + repaint(false); } void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) diff --git a/kdeui/tests/kdialogbasetest.cpp b/kdeui/tests/kdialogbasetest.cpp index 8092f27ef..5e62115fa 100644 --- a/kdeui/tests/kdialogbasetest.cpp +++ b/kdeui/tests/kdialogbasetest.cpp @@ -12,12 +12,12 @@ int main(int argc, char** argv) "

DialogBase Example


" "This example shows the usage of the DialogBase class. " "DialogBase is the KDE user interface class used to create " - "dialogs with unique tqlayout without having to define an own dialog " + "dialogs with unique layout without having to define an own dialog " "style for your application.
" "It provides three standard buttons (OK, Apply, and " "Cancel) that are needed in most dialogs. Each one may be " "hidden, enabled or disabled, and tooltips and quickhelp texts might be" - " added. And you do not need to bother about tqgeometry management, this " + " added. And you do not need to bother about geometry management, this " "is all done automatically.
" "To polish your user interface even further, you might want to add " "textures to the inner and the outer frame of the dialog (the frame is " @@ -60,11 +60,11 @@ int main(int argc, char** argv) view.setMinimumSize( 250, 300 ); dialog.setMainWidget(&view); /* After finishing the setup of your main widget, the dialog needs to be - adjusted. It is not done automatically, since the tqlayout of the main + adjusted. It is not done automatically, since the layout of the main widget may change before the dialog is shown. Additionally, setting a help chapter may cause a need for adjustment since it modifies the height of the upper frame. */ - dialog.resize(dialog.tqminimumSize()); + dialog.resize(dialog.minimumSize()); /* The dialog object is used just as any other TQDialog: */ if(dialog.exec()) { diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp index 8cec435c3..15b83d14e 100644 --- a/kdeui/tests/kdockwidgetdemo.cpp +++ b/kdeui/tests/kdockwidgetdemo.cpp @@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const :TQDialog(0L,name,true) { KConfig* config = kapp->config(); - config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name ); + config->setGroup( TQString::fromLatin1("SFileDialogData:") + name ); if ( initially.isNull() ){ initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() ); } @@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->tqrepaint( true ); + viewport()->repaint( true ); } void PixmapView::drawContents( TQPainter *p, int, int, int, int ) @@ -280,7 +280,7 @@ void Preview::showPreview( const TQString &str ) TQTextStream ts( &f ); TQString text = ts.read(); f.close(); - if ( fi.extension().lower().tqcontains( "htm" ) ) { + if ( fi.extension().lower().contains( "htm" ) ) { TQString url = html->mimeSourceFactory()->makeAbsolute( path, html->context() ); html->setText( text, url ); raiseWidget( html ); @@ -777,13 +777,13 @@ int main(int argc, char* argv[]) { #endif #if 0 - qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"), - TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) ); + qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"), + TQString::fromLatin1("DockWidget Demo"), "dialog1" ) ); #endif #if 1 - TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"), - TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ); + TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"), + TQString::fromLatin1("DockWidget Demo"), "dialog1" ); TQStringList::Iterator it = s.begin(); for ( ; it != s.end(); ++it ){ qDebug( "%s", (*it).local8Bit().data() ); diff --git a/kdeui/tests/kdualcolortest.cpp b/kdeui/tests/kdualcolortest.cpp index 031a54c80..2060a9842 100644 --- a/kdeui/tests/kdualcolortest.cpp +++ b/kdeui/tests/kdualcolortest.cpp @@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) { lbl = new TQLabel("Testing, testing, 1, 2, 3...", this); KDualColorButton *colorBtn = - new KDualColorButton(lbl->tqcolorGroup().text(), - lbl->tqcolorGroup().background(), this); + new KDualColorButton(lbl->colorGroup().text(), + lbl->colorGroup().background(), this); connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), TQT_SLOT(slotFgChanged(const TQColor &))); connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), @@ -19,11 +19,11 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); - tqlayout->addWidget(colorBtn, 0); - tqlayout->addWidget(lbl, 1); - tqlayout->activate(); - resize(tqsizeHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + layout->addWidget(colorBtn, 0); + layout->addWidget(lbl, 1); + layout->activate(); + resize(sizeHint()); } void KDualColorWidget::slotFgChanged(const TQColor &c) diff --git a/kdeui/tests/keditlistboxtest.cpp b/kdeui/tests/keditlistboxtest.cpp index fdc90a742..90dbb74d0 100644 --- a/kdeui/tests/keditlistboxtest.cpp +++ b/kdeui/tests/keditlistboxtest.cpp @@ -7,14 +7,14 @@ int main( int argc, char **argv ) KApplication app( argc, argv, "keditlistboxtest" ); KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) ); - KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"), + KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"), editor ); - box->insertItem( TQString::tqfromLatin1("Test") ); - box->insertItem( TQString::tqfromLatin1("for") ); - box->insertItem( TQString::tqfromLatin1("this") ); - box->insertItem( TQString::tqfromLatin1("KEditListBox") ); - box->insertItem( TQString::tqfromLatin1("Widget") ); + box->insertItem( TQString::fromLatin1("Test") ); + box->insertItem( TQString::fromLatin1("for") ); + box->insertItem( TQString::fromLatin1("this") ); + box->insertItem( TQString::fromLatin1("KEditListBox") ); + box->insertItem( TQString::fromLatin1("Widget") ); box->show(); return app.exec(); diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp index f8d031530..d68f1e366 100644 --- a/kdeui/tests/kledtest.cpp +++ b/kdeui/tests/kledtest.cpp @@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent) } else { y=Grid; index=0; - for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) { + for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) { x=Grid; for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) { leds[index]=new KLed(Qt::yellow, state, (KLed::Look)(look+1), - (KLed::Shape)(tqshape+1), this); + (KLed::Shape)(shape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); ++index; x+=Grid+LedWidth; @@ -108,7 +108,7 @@ KLedTest::nextLook() { ledlook = static_cast(tmp); l->setLook(ledlook); //qDebug("painting look %i", ledlook); - //l->tqrepaint(); + //l->repaint(); } diff --git a/kdeui/tests/kledtest.h b/kdeui/tests/kledtest.h index 7a1416090..33c70fe83 100644 --- a/kdeui/tests/kledtest.h +++ b/kdeui/tests/kledtest.h @@ -15,7 +15,7 @@ protected: const int LedWidth; const int LedHeight; const int Grid; - KLed::Shape tqshape; + KLed::Shape shape; KLed::Look look; KLed::State state; int x, y, index; diff --git a/kdeui/tests/klineedittest.cpp b/kdeui/tests/klineedittest.cpp index 7b9049c06..3508982fa 100644 --- a/kdeui/tests/klineedittest.cpp +++ b/kdeui/tests/klineedittest.cpp @@ -19,7 +19,7 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name ) :TQWidget( widget, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQStringList list; list << "Tree" << "Suuupa" << "Stroustrup" << "Stone" << "Slick" @@ -54,8 +54,8 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name ) m_btnHide->setFixedSize(100,30); connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) ); - tqlayout->addWidget( m_lineedit ); - tqlayout->addWidget( hbox ); + layout->addWidget( m_lineedit ); + layout->addWidget( hbox ); setCaption( "KLineEdit Unit Test" ); } diff --git a/kdeui/tests/kmessageboxtest.cpp b/kdeui/tests/kmessageboxtest.cpp index 44630c178..1b926739f 100644 --- a/kdeui/tests/kmessageboxtest.cpp +++ b/kdeui/tests/kmessageboxtest.cpp @@ -21,22 +21,22 @@ public: ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) : TQLabel(parent, name ) { - // Make the top-level tqlayout; a vertical box to contain all widgets - // and sub-tqlayouts. + // Make the top-level layout; a vertical box to contain all widgets + // and sub-layouts. TQSize sh; setText("

Hello.

"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("Hello."); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("

Hello
World

"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); // setText("Hello\nWorld"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } @@ -79,11 +79,11 @@ case 1: i = KMessageBox::warningContinueCancel(w, "You are about to .\n" "Are you sure?", - "Print", TQString::tqfromLatin1("&Print"), "dontask", false); + "Print", TQString::fromLatin1("&Print"), "dontask", false); i = KMessageBox::warningContinueCancel(0, "You are about to .\n" "Are you sure?", - "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink); + "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink); i = KMessageBox::questionYesNo(0, "

Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has this URL.

", TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink); break; @@ -96,7 +96,7 @@ case 2: case 3: i = KMessageBox::questionYesNo(0, "Does your printer support color or only black and white?", - "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White")); + "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White")); break; case 4: @@ -123,33 +123,33 @@ case 6: i = KMessageBox::warningContinueCancel(0, "You are about to print.\n" "Are you sure?", - "Print", TQString::tqfromLatin1("&Print")); + "Print", TQString::fromLatin1("&Print")); break; case 7: i = KMessageBox::warningContinueCancel(0, "You are about to .\n" "Are you sure?", - "Print", TQString::tqfromLatin1("&Print"), "dontask", false); + "Print", TQString::fromLatin1("&Print"), "dontask", false); break; case 8: i = KMessageBox::warningYesNoCancel(0, - "Your document tqcontains unsaved changes.\n" + "Your document contains unsaved changes.\n" "Do you want to save your changes?\n"); break; case 9: i = KMessageBox::warningYesNoCancel(0, - "Your document tqcontains unsaved changes.\n" + "Your document contains unsaved changes.\n" "Do you want to save your changes?\n", - TQString::tqfromLatin1("Close")); + TQString::fromLatin1("Close")); break; case 10: i = KMessageBox::warningYesNoCancel(0, - "Your document tqcontains unsaved changes.\n" + "Your document contains unsaved changes.\n" "Do you want to save or discard your changes?\n", - "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") ); + "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") ); break; case 11: diff --git a/kdeui/tests/kpanelmenutest.cpp b/kdeui/tests/kpanelmenutest.cpp index e081e467f..6f2d8f2be 100644 --- a/kdeui/tests/kpanelmenutest.cpp +++ b/kdeui/tests/kpanelmenutest.cpp @@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) init(); setText("We added \"Client Test\" to kicker. Click the K Menu to check."); - resize(tqsizeHint()); + resize(sizeHint()); } void TestWidget::init() diff --git a/kdeui/tests/kpopuptest.cpp b/kdeui/tests/kpopuptest.cpp index 3db71106b..96f4b3d32 100644 --- a/kdeui/tests/kpopuptest.cpp +++ b/kdeui/tests/kpopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); + menu->insertItem("Quit", qApp, TQT_SLOT(quit())); } }; diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp index b221ef397..ad2f5630a 100644 --- a/kdeui/tests/krulertest.cpp +++ b/kdeui/tests/krulertest.cpp @@ -55,7 +55,7 @@ KRulerTest::KRulerTest( const char *name ) { mainframe = new TQFrame(this); - tqlayout = new TQGridLayout(mainframe, 2, 2); + layout = new TQGridLayout(mainframe, 2, 2); miniwidget = new TQFrame(mainframe); miniwidget->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); @@ -85,10 +85,10 @@ KRulerTest::KRulerTest( const char *name ) connect( bigwidget, TQT_SIGNAL(newHeight(int)), TQT_SLOT(slotNewHeight(int)) ); - tqlayout->addWidget(miniwidget, 0, 0); - tqlayout->addWidget(hruler, 0, 1); - tqlayout->addWidget(vruler, 1, 0); - tqlayout->addWidget(bigwidget, 1, 1); + layout->addWidget(miniwidget, 0, 0); + layout->addWidget(hruler, 0, 1); + layout->addWidget(vruler, 1, 0); + layout->addWidget(bigwidget, 1, 1); mouse_message = new TQLabel("Press and hold mouse button\nfor pointer movement", bigwidget); mouse_message->adjustSize(); @@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name ) beginMark = new KIntNumInput(0, lineEdit); beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); - beginMark->setFixedSize(beginMark->tqsizeHint()); + beginMark->setFixedSize(beginMark->sizeHint()); connect(beginMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotNewOffset(int)) ); connect(beginMark, TQT_SIGNAL(valueChanged(int)), @@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name ) endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); - endMark->setFixedSize(endMark->tqsizeHint()); + endMark->setFixedSize(endMark->sizeHint()); connect(endMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(endMark, TQT_SIGNAL(valueChanged(int)), @@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name ) lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); - lengthInput->setFixedSize(lengthInput->tqsizeHint()); + lengthInput->setFixedSize(lengthInput->sizeHint()); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), @@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name ) transX = new KDoubleNumInput(0.0, vertrot); transX->setRange(-1000, 1000, 1, false); transX->move(5, 15); - transX->setFixedSize(transX->tqsizeHint()); + transX->setFixedSize(transX->sizeHint()); //transX->setLabel("transx", AlignLeft); connect(transX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); - transY->setFixedSize(transY->tqsizeHint()); + transY->setFixedSize(transY->sizeHint()); //transY->setLabel("transy", AlignLeft); connect(transY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); - rotV->setFixedSize(rotV->tqsizeHint()); + rotV->setFixedSize(rotV->sizeHint()); //rotV->setLabel("rot", AlignLeft); connect(rotV, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetRotate(double)) ); @@ -221,7 +221,7 @@ KRulerTest::KRulerTest( const char *name ) KRulerTest::~KRulerTest() { - delete tqlayout; + delete layout; delete hruler; delete vruler; delete miniwidget; diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h index b21c5375f..fe552467c 100644 --- a/kdeui/tests/krulertest.h +++ b/kdeui/tests/krulertest.h @@ -74,7 +74,7 @@ private slots: private: KRuler *hruler, *vruler; - TQGridLayout *tqlayout; + TQGridLayout *layout; TQFrame *miniwidget, *bigwidget; TQFrame *mainframe; diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp index f67dd17a9..32ed5c89f 100644 --- a/kdeui/tests/ktabwidgettest.cpp +++ b/kdeui/tests/ktabwidgettest.cpp @@ -39,51 +39,51 @@ Test::Test( TQWidget* parent, const char *name ) mWidget->setTabReorderingEnabled( true ); TQWidget * grid = new TQWidget(this); - TQGridLayout * gridtqlayout = new TQGridLayout( grid, 5, 2 ); + TQGridLayout * gridlayout = new TQGridLayout( grid, 5, 2 ); TQPushButton * addTab = new TQPushButton( "Add Tab", grid ); - gridtqlayout->addWidget( addTab, 0, 0 ); + gridlayout->addWidget( addTab, 0, 0 ); connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid ); - gridtqlayout->addWidget( removeTab, 0, 1 ); + gridlayout->addWidget( removeTab, 0, 1 ); connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); mLeftButton = new TQCheckBox( "Show left button", grid ); - gridtqlayout->addWidget( mLeftButton, 1, 0 ); + gridlayout->addWidget( mLeftButton, 1, 0 ); connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) ); mLeftButton->setChecked(true); TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid ); - gridtqlayout->addWidget( leftPopup, 2, 0 ); + gridlayout->addWidget( leftPopup, 2, 0 ); connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) ); leftPopup->setChecked(true); mRightButton = new TQCheckBox( "Show right button", grid ); - gridtqlayout->addWidget( mRightButton, 1, 1 ); + gridlayout->addWidget( mRightButton, 1, 1 ); connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) ); mRightButton->setChecked(true); TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid ); - gridtqlayout->addWidget( rightPopup, 2, 1 ); + gridlayout->addWidget( rightPopup, 2, 1 ); connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) ); rightPopup->setChecked(true); mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid ); - gridtqlayout->addWidget( mTabsBottom, 3, 0 ); + gridlayout->addWidget( mTabsBottom, 3, 0 ); connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); - TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid ); - gridtqlayout->addWidget( tabtqshape, 3, 1 ); - connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); + gridlayout->addWidget( tabshape, 3, 1 ); + connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); - gridtqlayout->addWidget( tabClose, 4, 0 ); + gridlayout->addWidget( tabClose, 4, 0 ); connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) ); tabClose->setChecked(true); TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid ); - gridtqlayout->addWidget( showlabels, 4, 1 ); + gridlayout->addWidget( showlabels, 4, 1 ); connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) ); } diff --git a/kdeui/tests/kunbalancedgrdtest.cpp b/kdeui/tests/kunbalancedgrdtest.cpp index 9f616496d..7f5b2cc78 100644 --- a/kdeui/tests/kunbalancedgrdtest.cpp +++ b/kdeui/tests/kunbalancedgrdtest.cpp @@ -159,7 +159,7 @@ void myTopWidget::rebalance() if ((otime - itime )> 500) { - grds->tqrepaint(false); + grds->repaint(false); itime = time.elapsed(); } } diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp index a96c9892a..91974263e 100644 --- a/kdeui/tests/kwizardtest.cpp +++ b/kdeui/tests/kwizardtest.cpp @@ -36,10 +36,10 @@ int main(int argc, char **argv) TQWidget *p = new TQWidget; TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); - TQHBoxLayout *tqlayout = new TQHBoxLayout(p, 5); - label->tqsetAlignment(Qt::AlignCenter); + TQHBoxLayout *layout = new TQHBoxLayout(p, 5); + label->setAlignment(Qt::AlignCenter); label->setFixedSize(300, 200); - tqlayout->addWidget(label); + layout->addWidget(label); TQString title = TQString("%1. page").arg(i); wiz->addPage(p, title); wiz->setFinishEnabled(p, (i==10)); diff --git a/kdeui/ui_standards.rc b/kdeui/ui_standards.rc index 6af8eedb1..8c4f1fe2c 100644 --- a/kdeui/ui_standards.rc +++ b/kdeui/ui_standards.rc @@ -69,11 +69,11 @@ - - - - - + + + + + @@ -197,7 +197,7 @@ - + -- cgit v1.2.1