From ba2a3ce341c0c71bbbcf350fcbcd60c552220b31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:23:13 -0600 Subject: Rename obsolete tq methods to standard names --- NewsLog.txt | 10 +- akregator/src/addfeedwidgetbase.ui | 4 +- akregator/src/akregator_view.cpp | 2 +- akregator/src/articleviewer.cpp | 4 +- akregator/src/listtabwidget.cpp | 10 +- akregator/src/mk4storage/metakit/CHANGES | 14 +-- akregator/src/mk4storage/metakit/tests/regress.cpp | 2 +- akregator/src/mk4storage/mk4confwidgetbase.ui | 6 +- akregator/src/propertieswidgetbase.ui | 6 +- akregator/src/settings_archive.ui | 2 +- akregator/src/settings_browser.ui | 2 +- akregator/src/simplenodeselector.cpp | 4 +- akregator/src/tabwidget.cpp | 10 +- akregator/src/tag.h | 2 +- akregator/src/tagpropertieswidgetbase.ui | 4 +- akregator/src/trayicon.cpp | 2 +- akregator/src/treenodeitem.cpp | 2 +- akregator/src/viewer.cpp | 4 +- certmanager/conf/appearanceconfigwidgetbase.ui | 2 +- certmanager/kwatchgnupg/kwatchgnupgconfig.cpp | 4 +- certmanager/lib/kleo/dn.cpp | 2 +- certmanager/lib/ui/cryptoconfigmodule.cpp | 2 +- certmanager/lib/ui/cryptoconfigmodule_p.h | 18 +-- certmanager/lib/ui/directoryserviceswidgetbase.ui | 6 +- certmanager/lib/ui/kdhorizontalline.cpp | 10 +- doc/api/doxygen.css | 2 +- .../boost-compat/config/abi/borland_prefix.hpp | 4 +- kaddressbook/TODO | 2 +- kaddressbook/addresseditwidget.cpp | 14 +-- kaddressbook/addresseeeditordialog.cpp | 4 +- kaddressbook/addresseeeditorextension.cpp | 4 +- kaddressbook/addresseeeditorwidget.cpp | 128 ++++++++++----------- kaddressbook/addviewdialog.cpp | 16 +-- kaddressbook/advancedcustomfields.cpp | 4 +- kaddressbook/contacteditorwidgetmanager.h | 2 +- kaddressbook/customfieldswidget.cpp | 28 ++--- kaddressbook/distributionlisteditor.cpp | 8 +- kaddressbook/distributionlistpicker.cpp | 8 +- kaddressbook/extensionmanager.cpp | 4 +- kaddressbook/features/distributionlistngwidget.cpp | 8 +- kaddressbook/filtereditdialog.cpp | 2 +- kaddressbook/freebusywidget.cpp | 6 +- kaddressbook/geowidget.cpp | 2 +- kaddressbook/imagewidget.cpp | 10 +- kaddressbook/incsearchwidget.cpp | 12 +- kaddressbook/jumpbuttonbar.cpp | 14 +-- kaddressbook/kabcore.cpp | 12 +- kaddressbook/kaddressbookview.cpp | 6 +- kaddressbook/kcmconfigs/addhostdialog.cpp | 4 +- kaddressbook/kcmconfigs/addresseewidget.cpp | 20 ++-- kaddressbook/kcmconfigs/extensionconfigdialog.cpp | 4 +- kaddressbook/kcmconfigs/kabconfigwidget.cpp | 14 +-- kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 +- kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 +- kaddressbook/kcmconfigs/ldapoptionswidget.cpp | 8 +- kaddressbook/keywidget.cpp | 12 +- kaddressbook/ldapsearchdialog.cpp | 2 +- kaddressbook/nameeditdialog.cpp | 34 +++--- kaddressbook/phoneeditwidget.cpp | 24 ++-- kaddressbook/printing/detailledstyle.cpp | 4 +- kaddressbook/printing/kabentrypainter.cpp | 2 +- kaddressbook/printing/selectionpage.cpp | 6 +- kaddressbook/printing/stylepage.cpp | 4 +- kaddressbook/secrecywidget.cpp | 4 +- kaddressbook/undocmds.cpp | 4 +- kaddressbook/viewmanager.cpp | 4 +- kaddressbook/views/cardview.cpp | 6 +- kaddressbook/views/cardview.h | 6 +- kaddressbook/views/configurecardviewdialog.cpp | 4 +- kaddressbook/views/configuretableviewdialog.cpp | 10 +- kaddressbook/views/kaddressbookcardview.cpp | 4 +- kaddressbook/views/kaddressbookiconview.cpp | 4 +- kaddressbook/views/kaddressbooktableview.cpp | 2 +- kaddressbook/xxport/csvimportdialog.cpp | 30 ++--- kaddressbook/xxport/vcard_xxport.cpp | 18 +-- kaddressbook/xxportselectdialog.cpp | 8 +- kalarm/Changelog | 4 +- kalarm/alarmlistview.cpp | 2 +- kalarm/alarmtimewidget.cpp | 10 +- kalarm/birthdaydlg.cpp | 18 +-- kalarm/deferdlg.cpp | 6 +- kalarm/editdlg.cpp | 66 +++++------ kalarm/find.cpp | 4 +- kalarm/fontcolour.cpp | 18 +-- kalarm/fontcolourbutton.cpp | 12 +- kalarm/functions.cpp | 2 +- kalarm/latecancel.cpp | 16 +-- kalarm/latecancel.h | 2 +- kalarm/lib/spinbox2.cpp | 18 +-- kalarm/lib/spinbox2.h | 2 +- kalarm/messagewin.cpp | 30 ++--- kalarm/prefdlg.cpp | 50 ++++---- kalarm/recurrenceedit.cpp | 94 +++++++-------- kalarm/recurrenceeditprivate.h | 2 +- kalarm/reminder.cpp | 8 +- kalarm/repetition.cpp | 18 +-- kalarm/sounddlg.cpp | 8 +- kalarm/specialactions.cpp | 6 +- kalarm/templatedlg.cpp | 14 +-- kalarm/timeselector.cpp | 6 +- kandy/src/mobilegui_base.ui | 2 +- karm/ktimewidget.cpp | 12 +- karm/preferences.cpp | 40 +++---- karm/printdialog.cpp | 22 ++-- karm/taskview.cpp | 14 +-- karm/test/lifetest.php | 2 +- kdgantt/KDGanttMinimizeSplitter.cpp | 18 +-- kdgantt/KDGanttSemiSizingControl.cpp | 28 ++--- kdgantt/KDGanttSemiSizingControl.h | 2 +- kdgantt/KDGanttView.cpp | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 8 +- kdgantt/KDGanttViewSubwidgets.h | 2 +- kioslaves/imap4/mailheader.h | 4 +- kitchensync/src/aboutpage.cpp | 4 +- kitchensync/src/configguievo2.cpp | 16 +-- kitchensync/src/configguignokii.cpp | 18 +-- kitchensync/src/configguigpe.cpp | 20 ++-- kitchensync/src/configguijescs.cpp | 18 +-- kitchensync/src/configguildap.cpp | 20 ++-- kitchensync/src/configguimoto.cpp | 8 +- kitchensync/src/configguiopie.cpp | 26 ++--- kitchensync/src/configguisynce.cpp | 14 +-- kitchensync/src/connectionwidgets.cpp | 44 +++---- kitchensync/src/groupconfigcommon.cpp | 18 +-- kitchensync/src/groupitem.cpp | 24 ++-- kitchensync/src/multiconflictdialog.cpp | 18 +-- kitchensync/src/pluginpicker.cpp | 12 +- kitchensync/src/singleconflictdialog.cpp | 14 +-- kmail/ChangeLog | 4 +- kmail/Mainpage.dox | 6 +- kmail/aboutdata.cpp | 2 +- kmail/accountdialog.cpp | 8 +- kmail/accountwizard.cpp | 40 +++---- kmail/antispamwizard.cpp | 32 +++--- kmail/chiasmuskeyselector.cpp | 12 +- kmail/configuredialog.cpp | 44 +++---- kmail/configuredialog_p.cpp | 2 +- kmail/customtemplates_base.ui | 12 +- kmail/encodingdetector.h | 2 +- kmail/folderdiaquotatab_p.cpp | 14 +-- kmail/foldertreebase.cpp | 4 +- kmail/headerstyle.cpp | 8 +- kmail/identitydialog.cpp | 4 +- kmail/kmaccount.cpp | 6 +- kmail/kmail.kcfg | 4 +- kmail/kmcommands.cpp | 2 +- kmail/kmcomposewin.cpp | 18 +-- kmail/kmedit.cpp | 4 +- kmail/kmfilterdlg.cpp | 2 +- kmail/kmfolderdia.cpp | 6 +- kmail/kmfoldertree.cpp | 4 +- kmail/kmheaders.cpp | 12 +- kmail/kmmainwidget.cpp | 4 +- kmail/kmmessage.h | 4 +- kmail/kmmimeparttree.cpp | 10 +- kmail/kmmsgbase.cpp | 32 +++--- kmail/kmmsgbase.h | 4 +- kmail/kmmsgpart.h | 2 +- kmail/kmreaderwin.cpp | 10 +- kmail/kmreaderwin.h | 2 +- kmail/mailinglistpropertiesdialog.cpp | 4 +- kmail/recipientseditor.cpp | 2 +- kmail/signatureconfigurator.cpp | 2 +- kmail/smimeconfiguration.ui | 8 +- kmail/snippetdlg.cpp | 4 +- kmail/snippetdlgbase.ui | 4 +- kmail/snippetsettingsbase.ui | 2 +- kmail/snippetwidget.cpp | 22 ++-- kmail/templatesconfiguration_base.ui | 2 +- kmail/warningconfiguration.ui | 2 +- kmail/xfaceconfigurator.cpp | 2 +- kmailcvt/filter_sylpheed.cxx | 2 +- kmailcvt/kimportpagedlg.ui | 4 +- kmailcvt/kselfilterpagedlg.ui | 2 +- kmobile/kmobile_selectiondialog.ui | 2 +- kmobile/pref.cpp | 8 +- knode/articlewidget.cpp | 4 +- knode/kncollectionview.cpp | 2 +- knode/kncomposer.cpp | 8 +- knode/knconfig.cpp | 8 +- knode/knconfigwidgets.cpp | 12 +- knode/kngroupbrowser.cpp | 2 +- knotes/ChangeLog | 4 +- knotes/knote.cpp | 14 +-- knotes/knotebutton.cpp | 6 +- knotes/knoteconfigdlg.cpp | 62 +++++----- knotes/knotesapp.cpp | 2 +- knotes/knotesnetsend.cpp | 2 +- knotes/resourcelocalconfig.cpp | 6 +- kode/kwsdl/kung/complexbaseinputfield.cpp | 6 +- kode/kwsdl/kung/listinputfield.cpp | 10 +- kode/kwsdl/kung/pageinputfield.cpp | 8 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 6 +- kontact/plugins/knotes/knotes_part.cpp | 2 +- kontact/plugins/knotes/knotes_part_p.h | 8 +- kontact/plugins/knotes/knotetip.cpp | 4 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 10 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 22 ++-- kontact/plugins/newsticker/summarywidget.cpp | 2 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 12 +- kontact/plugins/summary/kcmkontactsummary.cpp | 8 +- kontact/plugins/summary/summaryview_part.cpp | 10 +- kontact/plugins/weather/summarywidget.cpp | 10 +- kontact/src/iconsidepane.cpp | 2 +- korganizer/calendarview.cpp | 6 +- korganizer/filteredit_base.ui | 4 +- korganizer/koagenda.cpp | 4 +- korganizer/koagendaitem.cpp | 2 +- korganizer/koagendaview.cpp | 2 +- korganizer/koattendeeeditor.cpp | 8 +- korganizer/koattendeeeditor.h | 4 +- korganizer/kodaymatrix.cpp | 2 +- korganizer/koeditoralarms_base.ui | 6 +- korganizer/koeditorattachments.cpp | 4 +- korganizer/koeditorgeneralevent.cpp | 6 +- korganizer/koeditorgeneralevent.h | 2 +- korganizer/koeditorrecurrence.cpp | 4 +- korganizer/koeditorrecurrence.h | 2 +- korganizer/kogroupwareprefspage.ui | 4 +- korganizer/kolistview.cpp | 2 +- korganizer/komonthview.cpp | 2 +- korganizer/navigatorbar.cpp | 2 +- .../printing/journal/calprintjournalconfig_base.ui | 2 +- .../printing/list/calprintlistconfig_base.ui | 2 +- .../whatsnext/calprintwhatsnextconfig_base.ui | 2 +- korganizer/printing/calprintpluginbase.cpp | 12 +- korganizer/printing/calprinttodoconfig_base.ui | 2 +- korganizer/printing/calprintweekconfig_base.ui | 4 +- korganizer/searchdialog.cpp | 12 +- korn/ChangeLog | 4 +- korn/boxcontaineritem.cpp | 18 +-- korn/kornaccountcfg.ui | 4 +- korn/kornaccountcfgimpl.cpp | 14 +-- korn/kornaccountcfgimpl.h | 2 +- korn/kornboxcfg.ui | 56 ++++----- korn/korncfgimpl.cpp | 12 +- korn/kornshell.cpp | 6 +- korn/maildrop.cpp | 16 +-- korn/password.cpp | 2 +- korn/progress_dialog.ui | 2 +- kresources/blogging/resourcebloggingsettings.ui | 2 +- kresources/caldav/configwidgets.cpp | 4 +- kresources/carddav/configwidgets.cpp | 4 +- kresources/egroupware/debugdialog.cpp | 4 +- .../groupwise/kcal_resourcegroupwiseconfig.cpp | 2 +- kresources/lib/folderselectdialog.cpp | 8 +- kresources/scalix/scalixadmin/delegatedialog.cpp | 10 +- kresources/scalix/scalixadmin/delegatepage.cpp | 10 +- kresources/scalix/scalixadmin/otheruserpage.cpp | 8 +- kresources/scalix/scalixadmin/outofofficepage.cpp | 10 +- kresources/scalix/scalixadmin/passwordpage.cpp | 14 +-- ktnef/gui/attachpropertydialogbase.ui | 2 +- ktnef/gui/wmfstruct.h | 2 +- ktnef/tests/mapi_attach_data_obj.tnef | Bin 348497 -> 348479 bytes libkcal/calselectdialog.cpp | 8 +- libkcal/dndfactory.cpp | 6 +- libkcal/versit/readme.txt | 6 +- libkmime/kmime_content.cpp | 16 +-- libkpgp/kpgpbaseG.cpp | 2 +- libkpgp/kpgpui.cpp | 18 +-- libkpimexchange/core/exchangeaccount.cpp | 4 +- libtdepim/addresseelineedit.cpp | 2 +- libtdepim/addresseeselector.cpp | 14 +-- libtdepim/addresspicker.ui | 4 +- libtdepim/categoryeditdialog.cpp | 10 +- libtdepim/categoryeditdialog_base.ui | 2 +- libtdepim/csshelper.cpp | 8 +- libtdepim/designerfields.cpp | 4 +- libtdepim/embeddedurlpage.cpp | 4 +- libtdepim/kcmdesignerfields.cpp | 8 +- libtdepim/kfoldertree.cpp | 6 +- libtdepim/komposer/core/prefsmodule.cpp | 2 +- .../kpartsdesignerplugin/kpartsdesignerplugin.cpp | 4 +- libtdepim/kprefsdialog.cpp | 14 +-- libtdepim/kprefsdialog.h | 24 ++-- libtdepim/ksubscription.cpp | 2 +- libtdepim/kwidgetlister.cpp | 2 +- libtdepim/kwidgetlister.h | 6 +- libtdepim/ldapsearchdialog.cpp | 2 +- libtdepim/linklocator.cpp | 2 +- libtdepim/overlaywidget.h | 4 +- libtdepim/progressdialog.cpp | 2 +- libtdepim/qutf7codec.cpp | 10 +- libtdepim/recentaddresses.cpp | 4 +- libtdepim/sendsmsdialog.cpp | 12 +- libtdepim/tests/testdateedit.cpp | 4 +- .../kmail/bodypartformatter/attendeeselector.cpp | 4 +- wizards/groupwarewizard.cpp | 4 +- wizards/overviewpage.cpp | 26 ++--- 289 files changed, 1371 insertions(+), 1371 deletions(-) diff --git a/NewsLog.txt b/NewsLog.txt index 2e934da9..bc32c09d 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -66,7 +66,7 @@ Problems addressed ------------------ * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126) -* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872) +* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872) * kolab/issue4455: calendar activate/deactivate handling broken * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message dialog 'store/throw away' (rt#6094) @@ -269,7 +269,7 @@ Problems addressed * kolab/issue3902: Delete a folder while syncing leads to crash * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076) * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075) -* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032) +* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032) * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930) @@ -551,7 +551,7 @@ Problems addressed * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact * kolab/issue3930: time on the Marcus Bains line doesn't change -* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872) +* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872) * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881) * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746) * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash @@ -565,7 +565,7 @@ Problems addressed * kolab/issue3065: Crash in KOAgendaItem::paintEvent * kolab/issue3902: Delete a folder while syncing leads to crash * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870) -* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872) +* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872) * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845) * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846) * kolab/issue3813: reccuring events show wrong dates (rt#5855) @@ -1474,7 +1474,7 @@ Friday, February 29th 2008 Problems addressed ------------------- -* Prevent crash after changing the tqlayout and replying then. (778728) +* Prevent crash after changing the layout and replying then. (778728) * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694) * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994) * kolab/issue1700 kleopatra crashes after ldap search. (780211) diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 9ab8644b..8ee0614d 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -24,7 +24,7 @@ - tqlayout16 + layout16 @@ -65,7 +65,7 @@ - tqlayout15 + layout15 diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 4a20008d..a4c1b26b 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress() link = article.link().url(); else link = article.guid(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(link, TQClipboard::Clipboard); cb->setText(link, TQClipboard::Selection); } diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 5f1870f9..40195069 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer() void ArticleViewer::generateNormalModeCSS() { - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp m_normalModeCSS = TQString( @@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS() void ArticleViewer::generateCombinedModeCSS() { - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp m_combinedModeCSS = TQString ( diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 77957ac6..f071cd95 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -52,7 +52,7 @@ public: int currentID; TQValueList views; TQMap idToView; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; ViewMode viewMode; TQMap captions; }; @@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare d->current = 0; d->currentID = -1; d->viewMode = verticalTabs; - d->tqlayout = new TQHBoxLayout(this); - //d->tqlayout = new TQGridLayout(this, 1, 2); + d->layout = new TQHBoxLayout(this); + //d->layout = new TQGridLayout(this, 1, 2); d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); d->tabBar->setStyle(KMultiTabBar::KDEV3ICON); //d->tabBar->setStyle(KMultiTabBar::KDEV3); d->tabBar->showActiveTabTexts(true); d->tabBar->setPosition(KMultiTabBar::Left); - d->tqlayout->addWidget(d->tabBar/*, 0, 0*/); + d->layout->addWidget(d->tabBar/*, 0, 0*/); d->stack = new TQWidgetStack(this); - d->tqlayout->addWidget(d->stack/*, 0, 1*/); + d->layout->addWidget(d->stack/*, 0, 1*/); // connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); } diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 20cd91d3..160c4bad 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -211,9 +211,9 @@ One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed comparison logic in mk4too.cpp (64-bit ints, new code). -2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes +2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes - Use list operators to convert a Tcl tqlayout to MK format. This used + Use list operators to convert a Tcl layout to MK format. This used to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to use a different notation for nested defs (^). @@ -605,13 +605,13 @@ c4_Storage::SaveTo function, memo's would sometimes not be written, leading to a *damaged* datafile (and incorrect free-space tracking). -2002-03-15 Better configure logic, "mk::view tqlayout" fix +2002-03-15 Better configure logic, "mk::view layout" fix Many tweaks to configures, makes, and libtool setup. Get rid of the library version numbers and the special Mk4*.so targets. Instead of Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so). - Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change. + Fixed "mk::view layout", it was broken by the 10-2-2002 change. 2002-03-13 Extend partial access 'B' usage @@ -658,9 +658,9 @@ causing it to detach empty top-level views, even when in use. Fixed, added s39 to test for this case. -2002-02-10 Improve Mk4tcl's "mk::view tqlayout" +2002-02-10 Improve Mk4tcl's "mk::view layout" - Avoid crash when asking for the tqlayout of a non-existent view. Now + Avoid crash when asking for the layout of a non-existent view. Now returns an error instead. 2002-02-07 Fast commit with many empty subviews @@ -1614,7 +1614,7 @@ new version in c4_Sequence allocate the c4_Bytes object lazily. Faster, and decreases sequence object size (for lots of subviews). - Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views + Mk4tcl, mk::layout now returns the proper layout even if the views are empty. Solved by adding extra arg to c4_Storage::Description, to return structure of a single top-level view. Fixes "mk8basic.1", and the returned string now has one bogus list layer stripped off. diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 2cd5f084..0725f57f 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -100,7 +100,7 @@ main() } // Recursively display the entire view contents. The results shown do not -// depend on file tqlayout (free space, file positions, flat vs. on-demand). +// depend on file layout (free space, file positions, flat vs. on-demand). static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0) { diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index 9063bf0f..c5c837a5 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -27,7 +27,7 @@ - tqlayout4 + layout4 @@ -46,7 +46,7 @@ - tqlayout3 + layout3 @@ -74,7 +74,7 @@ - tqlayout4 + layout4 diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index de9f28ec..4ab1ea91 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -39,7 +39,7 @@ - tqlayout8 + layout8 @@ -100,7 +100,7 @@ - tqlayout9 + layout9 @@ -362,7 +362,7 @@ - tqlayout4 + layout4 diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui index a068a9f5..68107e39 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -25,7 +25,7 @@ - tqlayout1 + layout1 diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui index e9982edd..b40d1c27 100644 --- a/akregator/src/settings_browser.ui +++ b/akregator/src/settings_browser.ui @@ -96,7 +96,7 @@ - tqlayout2 + layout2 diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index bb55e24c..cb296bee 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1); - tqlayout->addWidget(d->view, 0, 0); + TQGridLayout* layout = new TQGridLayout(this, 1, 1); + layout->addWidget(d->view, 0, 0); d->visitor = new NodeVisitor(this); diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 6d733d47..eeeb3cbd 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f) uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); + x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } return x; } @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection); - kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() diff --git a/akregator/src/tag.h b/akregator/src/tag.h index d215eb8f..4e1e0222 100644 --- a/akregator/src/tag.h +++ b/akregator/src/tag.h @@ -81,7 +81,7 @@ class Tag bool isNull() const; - /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */ + /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */ TQString id() const; /** user-visible name of the tag */ diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui index 45571a73..e6b4c34b 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -22,7 +22,7 @@ - tqlayout1 + layout1 @@ -62,7 +62,7 @@ - tqlayout9 + layout9 diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 8bfb7895..31ced17a 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const // Paint the border const int BORDER = 1; TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER); - finalShot.fill(KApplication::tqpalette().active().foreground()); + finalShot.fill(KApplication::palette().active().foreground()); painter.begin(&finalShot); painter.drawPixmap(BORDER, BORDER, shot); painter.end(); diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index 32b12c9c..3299e278 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const } -// TODO: reverse for reverse tqlayout +// TODO: reverse for reverse layout void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index d24e715f..b1932b46 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -203,7 +203,7 @@ void Viewer::slotCopy() { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); @@ -212,7 +212,7 @@ void Viewer::slotCopy() void Viewer::slotCopyLinkAddress() { if(m_url.isEmpty()) return; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(m_url.prettyURL(), TQClipboard::Clipboard); cb->setText(m_url.prettyURL(), TQClipboard::Selection); } diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index b03cfb8f..57029201 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -37,7 +37,7 @@ - tqlayout2 + layout2 diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 20c474a4..5a49f134 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() ); group = new TQVGroupBox( i18n("WatchGnuPG"), top ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setSpacing( spacingHint() ); w = new TQWidget( group ); @@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) /******************* Log Window group *******************/ group = new TQVGroupBox( i18n("Log Window"), top ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setSpacing( spacingHint() ); w = new TQWidget( group ); diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 685d241b..774302ba 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) { TQString result; for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) { const TQChar ch = s[i]; - switch ( ch.tqunicode() ) { + switch ( ch.unicode() ) { case ',': case '+': case '"': diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index d1f6f0ac..1fdbc9e0 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg dialogHeight = 400; TQSize sz = scrollView->sizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent), + + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent), TQMIN( compGUI->sizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index 65cae249..0c5f0087 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -82,7 +82,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -102,7 +102,7 @@ namespace Kleo { static CryptoConfigEntryGUI* createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 ); + TQGridLayout * layout, TQWidget* widget, const char* name = 0 ); }; /** @@ -154,7 +154,7 @@ namespace Kleo { CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -174,7 +174,7 @@ namespace Kleo { CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -194,7 +194,7 @@ namespace Kleo { CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -214,7 +214,7 @@ namespace Kleo { CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -234,7 +234,7 @@ namespace Kleo { CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -254,7 +254,7 @@ namespace Kleo { CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -273,7 +273,7 @@ namespace Kleo { CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index 016712eb..fcc7d493 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -44,7 +44,7 @@ - tqlayout2 + layout2 @@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates. - tqlayout1 + layout1 @@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates. - tqlayout3 + layout3 diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index c901a2fd..a053c992 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() { qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); - const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { x = 0; } TQRect r( x, 0, tw, h ); - int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); - if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) + const TQColor pen( (TQRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); + if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; - tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), + style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title } diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css index 9e45a547..e059f34a 100644 --- a/doc/api/doxygen.css +++ b/doc/api/doxygen.css @@ -362,7 +362,7 @@ display: none; @media aural { .doNotDisplay { display: inline; }} -/* Stylesheet that handles PIM-specific classes and tqlayout */ +/* Stylesheet that handles PIM-specific classes and layout */ #content h1 { diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp index c911a735..49f42494 100644 --- a/indexlib/boost-compat/config/abi/borland_prefix.hpp +++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp @@ -10,9 +10,9 @@ // -Ve (on or off - empty base classes) // -aX (alignment - 5 options). // -pX (Calling convention - 4 options) -// -VmX (member pointer size and tqlayout - 5 options) +// -VmX (member pointer size and layout - 5 options) // -VC (on or off, changes name mangling) -// -Vl (on or off, changes struct tqlayout). +// -Vl (on or off, changes struct layout). // In addition the following warnings are sufficiently annoying (and // unfixable) to have them turned off by default: diff --git a/kaddressbook/TODO b/kaddressbook/TODO index 83f33587..df0db82b 100644 --- a/kaddressbook/TODO +++ b/kaddressbook/TODO @@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten) file to get a list of views) - DONE - Redo and move the DCOP interface - 50% - Cleanup the tableview more - DONE -- Retqlayout the edit contact dialog - DONE +- Relayout the edit contact dialog - DONE - Remove ContactEntry*. Impelement supporting classes required for this. - DONE - Update the way the ConfigureView dialog gets the view config page - DONE diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 09047fa6..3924f901 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -82,25 +82,25 @@ class TabPressEater : public TQObject AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 ); + layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateAddressEdit() ) ); - tqlayout->addWidget( mTypeCombo ); + layout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); mAddressField->setAlignment( TQt::AlignTop ); mAddressField->setTextFormat( TQt::PlainText ); - tqlayout->addWidget( mAddressField ); + layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - tqlayout->addWidget( mEditButton ); + layout->addWidget( mEditButton ); } AddressEditWidget::~AddressEditWidget() @@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) parent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); mTypeList = KABC::Address::typeList(); mTypeList.remove( KABC::Address::Pref ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 5ac80b06..cbb60bd2 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) { mEditorWidget = new SimpleAddresseeEditor( page ); @@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, mEditorWidget = new AddresseeEditorWidget( page ); } connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); - tqlayout->addWidget( mEditorWidget ); + layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 72e119d9..d13232b7 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -36,14 +36,14 @@ AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) mAddresseeEditor = new SimpleAddresseeEditor( this ); else mAddresseeEditor = new AddresseeEditorWidget( this ); - tqlayout->addWidget( mAddresseeEditor ); + layout->addWidget( mAddresseeEditor ); } AddresseeEditorExtension::~AddresseeEditorExtension() diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 49013aa6..cceba545 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& ) void AddresseeEditorWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mTabWidget = new TQTabWidget( this ); - tqlayout->addWidget( mTabWidget ); + layout->addWidget( mTabWidget ); setupTab1(); setupTab2(); @@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1() // This is the General tab TQWidget *tab1 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); // First name button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); @@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1() mNameLabel->show(); } - tqlayout->addWidget( button, 0, 1 ); - tqlayout->addWidget( mNameEdit, 0, 2 ); - tqlayout->addWidget( mNameLabel, 0, 2 ); + layout->addWidget( button, 0, 1 ); + layout->addWidget( mNameEdit, 0, 2 ); + layout->addWidget( mNameLabel, 0, 2 ); label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); - tqlayout->addWidget( label, 1, 1 ); - tqlayout->addWidget( mRoleEdit, 1, 2 ); + layout->addWidget( label, 1, 1 ); + layout->addWidget( mRoleEdit, 1, 2 ); // Organization label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); @@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1() label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( organizationTextChanged( const TQString& ) ) ); - tqlayout->addWidget( label, 2, 1 ); - tqlayout->addWidget( mOrgEdit, 2, 2 ); + layout->addWidget( label, 2, 1 ); + layout->addWidget( mOrgEdit, 2, 2 ); // File as (formatted name) label = new TQLabel( i18n( "Formatted name:" ), tab1 ); mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); - tqlayout->addWidget( label, 3, 1 ); - tqlayout->addWidget( mFormattedNameLabel, 3, 2 ); + layout->addWidget( label, 3, 1 ); + layout->addWidget( mFormattedNameLabel, 3, 2 ); // Left hand separator. This separator doesn't go all the way // across so the dialog still flows from top to bottom bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 ); + layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 ); + layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); + layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 ); + layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 ); + layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); + layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 ); + layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); + layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 ); + layout->addMultiCellWidget( bar, 7, 7, 3, 6 ); TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); @@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1() label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); - tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); + layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( i18n("Blog feed:"), tab1 ); @@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1() connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); - tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); + layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); + layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); - tqlayout->addColSpacing( 6, 50 ); + layout->addColSpacing( 6, 50 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 ); + layout->addMultiCellWidget( bar, 11, 11, 0, 6 ); /////////////////////////////////////// TQHBox *categoryBox = new TQHBox( tab1 ); @@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1() mSecrecyWidget = new SecrecyWidget( categoryBox ); connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); + layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab1, i18n( "&General" ) ); } @@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2() // This is the Details tab TQWidget *tab2 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); label = new TQLabel( i18n( "Department:" ), tab2 ); - tqlayout->addWidget( label, 0, 1 ); + layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); - tqlayout->addWidget( mDepartmentEdit, 0, 2 ); + layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); - tqlayout->addWidget( label, 1, 1 ); + layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); - tqlayout->addWidget( mOfficeEdit, 1, 2 ); + layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); - tqlayout->addWidget( label, 2, 1 ); + layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); - tqlayout->addWidget( mProfessionEdit, 2, 2 ); + layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); - tqlayout->addWidget( label, 0, 3 ); + layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); - tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); + layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); - tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); + layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); - tqlayout->addWidget( label, 2, 3 ); + layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); - tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); + layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 ); + layout->addMultiCellWidget( bar, 3, 3, 0, 5 ); ///////////////////////////////////////////////// // Personal info @@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 ); + layout->addMultiCellWidget( label, 4, 5, 0, 0 ); label = new TQLabel( i18n( "Nickname:" ), tab2 ); - tqlayout->addWidget( label, 4, 1 ); + layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); - tqlayout->addWidget( mNicknameEdit, 4, 2 ); + layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); - tqlayout->addWidget( label, 5, 1 ); + layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); - tqlayout->addWidget( mSpouseEdit, 5, 2 ); + layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); - tqlayout->addWidget( label, 4, 3 ); + layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); - tqlayout->addWidget( mBirthdayPicker, 4, 4 ); + layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); - tqlayout->addWidget( label, 5, 3 ); + layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); - tqlayout->addWidget( mAnniversaryPicker, 5, 4 ); + layout->addWidget( mAnniversaryPicker, 5, 4 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 ); + layout->addMultiCellWidget( bar, 6, 6, 0, 5 ); ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); - tqlayout->addWidget( label, 7, 0 ); + layout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); - tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); + layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab2, i18n( "&Details" ) ); } @@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() page->addWidget( widget ); } - // query the tqlayout update + // query the layout update TQDictIterator it( mTabPages ); for ( ; it.current(); ++it ) it.current()->updateLayout(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index b9f89249..2da1ad4e 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict *viewFactoryDict, TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->setRowStretch( 1, 1 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2 ); + layout->setSpacing( spacingHint() ); + layout->setRowStretch( 1, 1 ); + layout->setColStretch( 1, 1 ); TQLabel *label = new TQLabel( i18n( "View name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( mViewNameEdit, 0, 1 ); + layout->addWidget( mViewNameEdit, 0, 1 ); mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page ); connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); - tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); - TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 ); + layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); int row = 0; diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 9ba59052..6af32523 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly ) void AdvancedCustomFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mFields = new KPIM::DesignerFields( uiFile, this ); - tqlayout->addWidget( mFields ); + layout->addWidget( mFields ); connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); } diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 5c7ff9fb..6bc418eb 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget void setReadOnly( bool readOnly ); /** - Calculates the tqlayout of the widgets and moves them to the + Calculates the layout of the widgets and moves them to the correct position. */ void updateLayout(); diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 752fd6cc..3212e8c0 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Title:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); label->setBuddy( mTitle ); - tqlayout->addWidget( mTitle, 0, 1 ); + layout->addWidget( mTitle, 0, 1 ); label = new TQLabel( i18n( "Type:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mType = new KComboBox( page ); label->setBuddy( mType ); - tqlayout->addWidget( mType, 1, 1 ); + layout->addWidget( mType, 1, 1 ); mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page ); mGlobal->setChecked( true ); - tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameChanged( const TQString& ) ) ); @@ -124,18 +124,18 @@ void AddFieldDialog::nameChanged( const TQString &name ) FieldWidget::FieldWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); mGlobalLayout->setAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); mSeparator->hide(); - tqlayout->addWidget( mSeparator ); + layout->addWidget( mSeparator ); - mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); mLocalLayout->setAlignment( TQt::AlignTop ); } @@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField() void CustomFieldsWidget::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mFieldWidget = new FieldWidget( this ); - tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Field..." ), this ); - tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); + layout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); + layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); // load global fields TQStringList globalFields = KABPrefs::instance()->globalCustomFields(); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index c9ac1254..0084fe86 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -67,16 +67,16 @@ public: KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); - TQBoxLayout* tqlayout = new TQHBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout* layout = new TQHBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( m_lineEdit ); + layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); - tqlayout->addWidget( m_clearButton ); + layout->addWidget( m_clearButton ); connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index aa59fe21..d82dc69f 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB enableButton( Ok, false ); setButtonText( User1, i18n( "Add New Distribution List" ) ); TQWidget* main = new TQWidget( this ); - TQGridLayout* tqlayout = new TQGridLayout( main ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* layout = new TQGridLayout( main ); + layout->setSpacing( KDialog::spacingHint() ); m_label = new TQLabel( main ); - tqlayout->addWidget( m_label, 0, 0 ); + layout->addWidget( m_label, 0, 0 ); m_listBox = new KListBox( main ); - tqlayout->addWidget( m_listBox, 1, 0 ); + layout->addWidget( m_listBox, 1, 0 ); connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( entrySelected( const TQString& ) ) ); connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 39727ecd..6f49e32e 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar ); + TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); mSplitter->setOrientation( Qt::Vertical ); - tqlayout->addWidget( mSplitter ); + layout->addWidget( mSplitter ); createExtensionWidgets(); diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 6b39414e..f91142e8 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); TQHBoxLayout *buttonLayout = new TQHBoxLayout(); - tqlayout->addLayout( buttonLayout ); + layout->addLayout( buttonLayout ); TQLabel *label = new TQLabel( this ); label->setText( i18n( "Distribution Lists" ) ); @@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); - tqlayout->addWidget( mListBox ); + layout->addWidget( mListBox ); connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateEntries() ) ); diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 5e1586e1..b1c5df43 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -272,7 +272,7 @@ void FilterDialog::initGUI() mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - buttonBox->tqlayout(); + buttonBox->layout(); topLayout->addWidget( buttonBox, 0, 1 ); } diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 7b81d9cc..7565584d 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -35,15 +35,15 @@ FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mURL = new KURLRequester( this ); label->setBuddy( mURL ); - tqlayout->addWidget( mURL ); + layout->addWidget( mURL ); connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 3f5a2972..000cc41d 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) topLayout->addWidget( mCityCombo, 0, 1 ); TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page ); - TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(), + TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), 2, 5, spacingHint() ); TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f0917eca..dd844499 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); mImageButton->setFixedSize( 100, 140 ); mImageButton->setImageLoader( mImageLoader ); - tqlayout->addWidget( mImageButton ); + layout->addWidget( mImageButton ); topLayout->addWidget( box ); @@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this ); - tqlayout->addWidget( mPhotoWidget ); + layout->addWidget( mPhotoWidget ); mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this ); - tqlayout->addWidget( mLogoWidget ); + layout->addWidget( mLogoWidget ); connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index 8509018a..b3ee3b09 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -40,7 +40,7 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); TQToolButton *button = new TQToolButton( this ); button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); @@ -48,24 +48,24 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) ); button->setAutoRaise( true ); TQToolTip::add( button, i18n( "Reset" ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mSearchText = new KLineEdit( this ); mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); TQWhatsThis::add( mSearchText, i18n( "The incremental search

Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) ); label->setBuddy( mSearchText ); - tqlayout->addWidget( mSearchText ); + layout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); - tqlayout->addWidget( mFieldCombo ); + layout->addWidget( mFieldCombo ); label->setBuddy(mFieldCombo); TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 07bc9809..4d052fd7 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam { setMinimumSize( 1, 1 ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); - tqlayout->setAlignment( TQt::AlignTop ); - tqlayout->setAutoAdd( true ); - tqlayout->setResizeMode( TQLayout::FreeResize ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 ); + layout->setAlignment( TQt::AlignTop ); + layout->setAutoAdd( true ); + layout->setResizeMode( TQLayout::FreeResize ); mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); mGroupBox->setExclusive( true ); - mGroupBox->tqlayout()->setSpacing( 0 ); - mGroupBox->tqlayout()->setMargin( 0 ); + mGroupBox->layout()->setSpacing( 0 ); + mGroupBox->layout()->setMargin( 0 ); mGroupBox->setFrameStyle( TQFrame::NoFrame ); } @@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons() TQFontMetrics fm = fontMetrics(); TQPushButton *btn = new TQPushButton( "", this ); btn->hide(); - TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn, + TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn, fm.size( ShowPrefix, "X - X") ). expandedTo( TQApplication::globalStrut() ); delete btn; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3c8a10d2..8c475e34 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid ) mActionMerge->setEnabled( ( list.size() == 2 ) && writable ); if ( mReadWrite ) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); @@ -552,11 +552,11 @@ void KABCore::copyContacts() #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( TQString::fromUtf8( clipText.data() ) ); #else TQString clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( clipText ); #endif } @@ -575,7 +575,7 @@ void KABCore::cutContacts() void KABCore::pasteContacts() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); @@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar() void KABCore::initActions() { - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); KAction *action; @@ -1432,7 +1432,7 @@ void KABCore::initActions() void KABCore::clipboardDataChanged() { if ( mReadWrite ) - mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() ); + mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() ); } void KABCore::updateIncSearchWidget() diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 43d709d2..028663e3 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees() void KAddressBookView::initGUI() { - // Create the tqlayout - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + // Create the layout + TQVBoxLayout *layout = new TQVBoxLayout( this ); // Add the view widget mViewWidget = new TQWidget( this ); - tqlayout->addWidget( mViewWidget ); + layout->addWidget( mViewWidget ); } KABC::Field::List KAddressBookView::fields() const diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 155f6f6b..53c06e2a 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const mServer = server; TQWidget *page = plainPage(); - TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); mCfg = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_USER | @@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const KABC::LdapConfigWidget::W_AUTHBOX, page ); - tqlayout->addWidget( mCfg ); + layout->addWidget( mCfg ); mCfg->setHost( mServer->host() ); mCfg->setPort( mServer->port() ); mCfg->setDn( mServer->baseDN() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 8c04002d..80af9227 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mTitle( title ), mLabel( label ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); mBox = new TQListBox( group ); @@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, mEditButton->setEnabled( false ); mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - bbox->tqlayout(); + bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); - tqlayout->addWidget( group ); + layout->addWidget( group ); } NamePartWidget::~NamePartWidget() @@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this ); - tqlayout->addWidget( mPrefix, 0, 0 ); + layout->addWidget( mPrefix, 0, 0 ); mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this ); - tqlayout->addWidget( mInclusion, 0, 1 ); + layout->addWidget( mInclusion, 0, 1 ); mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this ); - tqlayout->addWidget( mSuffix, 0, 2 ); + layout->addWidget( mSuffix, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mFormattedNameCombo = new KComboBox( this ); mFormattedNameCombo->insertItem( i18n( "Empty" ) ); @@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Full Name" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); - tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 68f4643a..97c8d0b2 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); mWidget = factory->configureWidget( page, "ExtensionConfigWidget" ); - tqlayout->addWidget( mWidget, 0, 0 ); + layout->addWidget( mWidget, 0, 0 ); mWidget->restoreSettings( mConfig ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index f97749e2..9b826b9e 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -56,11 +56,11 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) // General page TQWidget *generalPage = new TQWidget( this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); @@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) editorLayout->addStretch( 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); - TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2, + TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); grid->addWidget( label, 0, 0 ); @@ -124,10 +124,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) grid->setColStretch( 1, 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); - boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); + boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); boxLayout->setAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); @@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) "

  • %c: Country ISO Code
    • " ) ); mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() ); boxLayout->addWidget( mLocationMapURL ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 4217a0a8..823f24f7 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -43,9 +43,9 @@ extern "C" KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e9541ea9..a3a9ee1b 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -44,9 +44,9 @@ extern "C" KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index e1f47e3d..92eda991 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults() void LDAPOptionsWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this ); groupBox->setInsideSpacing( KDialog::spacingHint() ); @@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI() TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); @@ -293,9 +293,9 @@ void LDAPOptionsWidget::initGUI() mEditButton->setEnabled( false ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); - buttons->tqlayout(); + buttons->layout(); - tqlayout->addWidget( buttons ); + layout->addWidget( buttons ); resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); } diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 8aceceec..42920b3b 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -41,25 +41,25 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Keys:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mKeyCombo = new KComboBox( this ); - tqlayout->addWidget( mKeyCombo, 0, 1 ); + layout->addWidget( mKeyCombo, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), this ); - tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); mExportButton = new TQPushButton( i18n( "Export..." ), this ); mExportButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); + layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index be7f899e..0ba765df 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 4bb6e370..718ce8e2 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, Ok, parent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->addColSpacing( 2, 100 ); + TQGridLayout *layout = new TQGridLayout( page ); + layout->setSpacing( spacingHint() ); + layout->addColSpacing( 2, 100 ); TQLabel *label; label = new TQLabel( i18n( "Honorific prefixes:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPrefixCombo = new KComboBox( page ); mPrefixCombo->setDuplicatesEnabled( false ); mPrefixCombo->setEditable( true ); mPrefixCombo->setEnabled( !readOnly ); label->setBuddy( mPrefixCombo ); - tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Given name:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mGivenNameEdit = new KLineEdit( page ); mGivenNameEdit->setReadOnly( readOnly ); label->setBuddy( mGivenNameEdit ); - tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); label = new TQLabel( i18n( "Additional names:" ), page ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mAdditionalNameEdit = new KLineEdit( page ); mAdditionalNameEdit->setReadOnly( readOnly ); label->setBuddy( mAdditionalNameEdit ); - tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); label = new TQLabel( i18n( "Family names:" ), page ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mFamilyNameEdit = new KLineEdit( page ); mFamilyNameEdit->setReadOnly( readOnly ); label->setBuddy( mFamilyNameEdit ); - tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); + layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); label = new TQLabel( i18n( "Honorific suffixes:" ), page ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mSuffixCombo = new KComboBox( page ); mSuffixCombo->setDuplicatesEnabled( false ); mSuffixCombo->setEditable( true ); mSuffixCombo->setEnabled( !readOnly ); label->setBuddy( mSuffixCombo ); - tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); + layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Formatted name:" ), page ); - tqlayout->addWidget( label, 5, 0 ); + layout->addWidget( label, 5, 0 ); mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); - tqlayout->addWidget( mFormattedNameCombo, 5, 1 ); + layout->addWidget( mFormattedNameCombo, 5, 1 ); connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); - tqlayout->addWidget( mFormattedNameEdit, 5, 2 ); + layout->addWidget( mFormattedNameEdit, 5, 2 ); mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); - tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); + layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values mFamilyNameEdit->setText( addr.familyName() ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 47d8d506..ff787e12 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected() PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) : TQWidget( parent ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 ); mTypeCombo = new PhoneTypeCombo( this ); mNumberEdit = new KLineEdit( this ); - tqlayout->addWidget( mTypeCombo ); - tqlayout->addWidget( mNumberEdit ); + layout->addWidget( mTypeCombo ); + layout->addWidget( mNumberEdit ); connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); @@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), mReadOnly( false ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2 ); + layout->setSpacing( KDialog::spacingHint() ); - mWidgetLayout = new TQVBoxLayout( tqlayout ); - tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); + mWidgetLayout = new TQVBoxLayout( layout ); + layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); mAddButton->setMaximumSize( mAddButton->sizeHint() ); - tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); + layout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); - tqlayout->addWidget( mRemoveButton, 1, 1 ); + layout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); @@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() ); mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); - tqlayout->addWidget( mPreferredBox ); + layout->addWidget( mPreferredBox ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); // fill widgets mTypeList = KABC::PhoneNumber::typeList(); diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 5d970b3b..a9c0b8d3 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->kcbHeaderTextColor->setColor( config->readColorEntry( ContactHeaderForeColor, &TQt::white ) ); - mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); - mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); + mPageAppearance->layout()->setMargin( KDialog::marginHint() ); + mPageAppearance->layout()->setSpacing( KDialog::spacingHint() ); } DetailledPrintStyle::~DetailledPrintStyle() diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 427dd9de..d7be5bd5 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the tqlayout later: + // the layout later: TQValueList parts; TQValueList contents; diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 4e52b57d..c77c00d9 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -52,10 +52,10 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index e157f182..c3fdc1e0 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -122,7 +122,7 @@ void StylePage::initGUI() TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); @@ -142,7 +142,7 @@ void StylePage::initGUI() group = new TQButtonGroup( i18n( "Print Style" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), + TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), KDialog::spacingHint() ); mStyleCombo = new KComboBox( false, group ); diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 29942cb7..5e4af749 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -32,10 +32,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mSecrecyCombo = new KComboBox( this ); - tqlayout->addWidget( mSecrecyCombo ); + layout->addWidget( mSecrecyCombo ); const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList(); KABC::Secrecy::TypeList::ConstIterator it; diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index e05024bd..a249c295 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -261,7 +261,7 @@ void CutCommand::unexecute() mAddresseeList.clear(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); kapp->processEvents(); cb->setText( mOldText ); } @@ -289,7 +289,7 @@ void CutCommand::execute() // Convert to clipboard mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); mOldText = cb->text(); kapp->processEvents(); #if defined(KABC_VCARD_ENCODING_FIX) diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index c1f9da03..073898df 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -601,9 +601,9 @@ void ViewManager::initActions() void ViewManager::initGUI() { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); mViewWidgetStack = new TQWidgetStack( this ); - tqlayout->addWidget( mViewWidgetStack ); + layout->addWidget( mViewWidgetStack ); } #include "viewmanager.moc" diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 44632e90..9675cdc8 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) // if we are the current item and the view has focus, draw focus rect if ( mView->currentItem() == this && mView->hasFocus() ) { - mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, + mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg, TQStyle::Style_FocusAtBorder, TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); @@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, calcLayout(); // allow setting costum colors in the viewport pale - TQColorGroup cg = viewport()->tqpalette().active(); + TQColorGroup cg = viewport()->palette().active(); TQRect clipRect( clipx, clipy, clipw, cliph ); TQRect cardRect; @@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event ) void CardView::calcLayout() { - // Start in the upper left corner and tqlayout all the + // Start in the upper left corner and layout all the // cars using their height and width int maxWidth = 0; int maxHeight = 0; diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index 7a007d95..0bd70e1d 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -516,7 +516,7 @@ class CardView : public TQScrollView void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph ); /** - Sets the tqlayout to dirty and repaints. + Sets the layout to dirty and repaints. */ void resizeEvent( TQResizeEvent* ); @@ -526,13 +526,13 @@ class CardView : public TQScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the tqlayout to dirty and calls for a repaint. + Sets the layout to dirty and calls for a repaint. */ void setLayoutDirty( bool dirty ); /** Does the math based on the bounding rect of the cards to properly - lay the cards out on the screen. This is only done if the tqlayout is + lay the cards out on the screen. This is only done if the layout is marked as dirty. */ void calcLayout(); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index a8d4537f..e4c00e7d 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) ); enableFonts(); - // tqlayout + // layout sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) ); sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) ); sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) ); @@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config ) config->writeEntry( "TextFont", lTextFont->font() ); config->writeEntry( "HeaderFont", lHeaderFont->font() ); } - // tqlayout + // layout config->writeEntry( "ItemMargin", sbMargin->value() ); config->writeEntry( "ItemSpacing", sbSpacing->value() ); config->writeEntry( "SeparatorWidth", sbSepWidth->value() ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 404746dc..ae9d6155 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config ) void LookAndFeelPage::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, i18n("Row Separator"), this); - tqlayout->addWidget(group); + layout->addWidget(group); mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"), group, "mAlternateButton"); @@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI() // Background Checkbox/Selector TQHBoxLayout *backgroundLayout = new TQHBoxLayout(); - tqlayout->addLayout(backgroundLayout); + layout->addLayout(backgroundLayout); mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); @@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI() // ToolTip Checkbox mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this, "mToolTipBox"); - tqlayout->addWidget(mToolTipBox); + layout->addWidget(mToolTipBox); #if KDE_IS_VERSION(3,2,90) mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" ); - tqlayout->addWidget( mIMPresenceBox ); + layout->addWidget( mIMPresenceBox ); #endif } diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 7d95c043..4656f62b 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, { mShowEmptyFields = false; - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mCardView = new AddresseeCardView( viewWidget(), "mCardView" ); mCardView->setSelectionMode( CardView::Extended ); - tqlayout->addWidget( mCardView ); + layout->addWidget( mCardView ); // Connect up the signals connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index b99bca85..d9c3aa2f 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, TQWidget *parent, const char *name) : KAddressBookView( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mIconView = new AddresseeIconView( viewWidget(), "mIconView" ); - tqlayout->addWidget( mIconView ); + layout->addWidget( mIconView ); // Connect up the signals connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 6fa73130..de1ae2ec 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config ) if ( config->readBoolEntry( "Background", false ) ) mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) ); - // Restore the tqlayout of the listview + // Restore the layout of the listview mListView->restoreLayout( config, config->group() ); } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 72ae7e78..a860b5f6 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -367,7 +367,7 @@ void CSVImportDialog::initGUI() { mPage = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(), + TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(), spacingHint() ); TQHBoxLayout *hbox = new TQHBoxLayout(); hbox->setSpacing( spacingHint() ); @@ -379,16 +379,16 @@ void CSVImportDialog::initGUI() mUrlRequester->setFilter( "*.csv" ); hbox->addWidget( mUrlRequester ); - tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); + layout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); - mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); - mDelimiterBox->tqlayout()->setMargin( marginHint() ); - TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); + mDelimiterBox->layout()->setSpacing( spacingHint() ); + mDelimiterBox->layout()->setMargin( marginHint() ); + TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); delimiterLayout->setAlignment( TQt::AlignTop ); - tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); + layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); mRadioComma->setChecked( true ); @@ -411,13 +411,13 @@ void CSVImportDialog::initGUI() mComboLine = new TQComboBox( false, mPage ); mComboLine->insertItem( i18n( "1" ) ); - tqlayout->addWidget( mComboLine, 2, 3 ); + layout->addWidget( mComboLine, 2, 3 ); mComboQuote = new TQComboBox( false, mPage ); mComboQuote->insertItem( i18n( "\"" ), 0 ); mComboQuote->insertItem( i18n( "'" ), 1 ); mComboQuote->insertItem( i18n( "None" ), 2 ); - tqlayout->addWidget( mComboQuote, 2, 2 ); + layout->addWidget( mComboQuote, 2, 2 ); mDatePatternEdit = new TQLineEdit( mPage ); mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default @@ -427,28 +427,28 @@ void CSVImportDialog::initGUI() "
  • M: month with 2 digits
    • " "
  • d: day with 1 or 2 digits
    • " "
  • D: day with 2 digits
    • " ) ); - tqlayout->addWidget( mDatePatternEdit, 2, 4 ); + layout->addWidget( mDatePatternEdit, 2, 4 ); label = new TQLabel( i18n( "Start at line:" ), mPage ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); label = new TQLabel( i18n( "Textquote:" ), mPage ); - tqlayout->addWidget( label, 1, 2 ); + layout->addWidget( label, 1, 2 ); label = new TQLabel( i18n( "Date format:" ), mPage ); - tqlayout->addWidget( label, 1, 4 ); + layout->addWidget( label, 1, 4 ); mIgnoreDuplicates = new TQCheckBox( mPage ); mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); - tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); + layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); mCodecCombo = new TQComboBox( mPage ); - tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); + layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); mTable = new TQTable( 0, 0, mPage ); mTable->setSelectionMode( TQTable::NoSelection ); mTable->horizontalHeader()->hide(); - tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); + layout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); setButtonText( User1, i18n( "Apply Template..." ) ); setButtonText( User2, i18n( "Save Template..." ) ); diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 022f6c5f..ad85389f 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, mContacts( list ) { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mView = new KPIM::AddresseeView( page ); mView->enableLinks( 0 ); mView->setVScrollBarMode( TQScrollView::Auto ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( Apply, i18n( "Import All..." ) ); @@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page ); - tqlayout->addWidget( mPrivateBox ); + layout->addWidget( mPrivateBox ); mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page ); - tqlayout->addWidget( mBusinessBox ); + layout->addWidget( mBusinessBox ); mOtherBox = new TQCheckBox( i18n( "Other fields" ), page ); - tqlayout->addWidget( mOtherBox ); + layout->addWidget( mOtherBox ); mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page ); - tqlayout->addWidget( mEncryptionKeys ); + layout->addWidget( mEncryptionKeys ); KConfig config( "kaddressbookrc" ); config.setGroup( "XXPortVCard" ); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index fce57e74..fa029a52 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -187,10 +187,10 @@ void XXPortSelectDialog::initGUI() mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); @@ -226,7 +226,7 @@ void XXPortSelectDialog::initGUI() TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); sortingGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); diff --git a/kalarm/Changelog b/kalarm/Changelog index 2671941a..a3a1c659 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -142,7 +142,7 @@ KAlarm Change Log - Add context help for sound file fade options. === Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 === -- Improve alarm edit dialogue tqlayout (Reminder controls moved to below Time box). +- Improve alarm edit dialogue layout (Reminder controls moved to below Time box). === Version 1.4.4 --- 11 July 2006 === - Use an alarm's previous deferral time interval as default for its next deferral. @@ -261,7 +261,7 @@ KAlarm Change Log - Fix crash when the last recurrence of an alarm is reached. - Fix random limit on expired alarm discard time if stepping with spinbox buttons. - Fix dialog layouts for right-to-left languages. -- Fix time spin box tqlayout for right-to-left languages. +- Fix time spin box layout for right-to-left languages. === Version 1.2.2 --- 27 November 2004 === - Make alarm daemon (kalarmd) exclusive to KAlarm. diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 3e3db18d..ed509816 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in */ int AlarmListViewItem::typeIconWidth(AlarmListView* v) { - return iconWidth() + 2 * v->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth); + return iconWidth() + 2 * v->style().pixelMetric(TQStyle::PM_DefaultFrameWidth); } /****************************************************************************** diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index ffda682c..45abca7c 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -151,7 +151,7 @@ void AlarmTimeWidget::init(int mode) : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAfterTimeRadio->setFocusWidget(mDelayTimeEdit); - // Set up the tqlayout, either narrow or wide + // Set up the layout, either narrow or wide if (mode & NARROW) { TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint()); @@ -160,10 +160,10 @@ void AlarmTimeWidget::init(int mode) grid->addWidget(timeBox, 1, 1, TQt::AlignAuto); grid->setColStretch(2, 1); topLayout->addStretch(); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addWidget(mAfterTimeRadio); - tqlayout->addWidget(mDelayTimeEdit); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->addWidget(mAfterTimeRadio); + layout->addWidget(mDelayTimeEdit); + layout->addStretch(); } else { diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index dd4ab50f..60430a63 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -148,30 +148,30 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) groupLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group); - tqlayout->addWidget(mSpecialActionsButton); + layout->addWidget(mSpecialActionsButton); } // Late display checkbox - default = allow late display - tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mLateCancel = new LateCancelSelector(false, group); - tqlayout->addWidget(mLateCancel); - tqlayout->addStretch(); + layout->addWidget(mLateCancel); + layout->addStretch(); // Sub-repetition button mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group); mSubRepetition->set(0, 0, true, 364*24*60); TQWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition")); - tqlayout->addWidget(mSubRepetition); + layout->addWidget(mSubRepetition); // Set the values to their defaults mFontColourButton->setDefaultFont(); diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index b2120f9d..7ea2f216 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -48,14 +48,14 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup"); mTimeWidget->setDateTime(initialDT); mTimeWidget->setMinDateTimeIsCurrent(); connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit())); - tqlayout->addWidget(mTimeWidget); - tqlayout->addSpacing(spacingHint()); + layout->addWidget(mTimeWidget); + layout->addSpacing(spacingHint()); setButtonWhatsThis(Ok, i18n("Defer the alarm until the specified time.")); setButtonWhatsThis(User1, i18n("Cancel the deferred alarm. This does not affect future recurrences.")); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 7df52956..b0da4471 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -230,9 +230,9 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup"); connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int))); topLayout->addWidget(mActionGroup, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); - TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5); + TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); + TQGridLayout* grid = new TQGridLayout(layout, 1, 5); // Message radio button mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton"); @@ -266,11 +266,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par grid->addWidget(mEmailRadio, 1, 6); initDisplayAlarms(mActionGroup); - tqlayout->addWidget(mDisplayAlarmsFrame); + layout->addWidget(mDisplayAlarmsFrame); initCommand(mActionGroup); - tqlayout->addWidget(mCommandFrame); + layout->addWidget(mCommandFrame); initEmail(mActionGroup); - tqlayout->addWidget(mEmailFrame); + layout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); @@ -285,14 +285,14 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral")); mDeferGroup->addSpace(0); - tqlayout = new TQHBoxLayout(topLayout); + layout = new TQHBoxLayout(topLayout); // Date and time entry if (mTemplate) { mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup"); connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int))); - tqlayout->addWidget(mTemplateTimeGroup); + layout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) @@ -350,7 +350,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par box->setFixedHeight(box->sizeHint().height()); grid->addWidget(box, 1, 1, alignment); - tqlayout->addStretch(); + layout->addStretch(); } else { @@ -373,12 +373,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - tqlayout = new TQHBoxLayout(topLayout, 0); + layout = new TQHBoxLayout(topLayout, 0); mConfirmAck = createConfirmAckCheckbox(mainPage); mConfirmAck->setFixedSize(mConfirmAck->sizeHint()); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (theApp()->korganizerEnabled()) { @@ -386,7 +386,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage); mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint()); TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar")); - tqlayout->addWidget(mShowInKorganizer); + layout->addWidget(mShowInKorganizer); } setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time.")); @@ -446,30 +446,30 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height()); frameLayout->addWidget(mFontColourButton); - TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0); mBgColourBox = new TQHBox(mDisplayAlarmsFrame); mBgColourBox->setSpacing(spacingHint()); - tqlayout->addWidget(mBgColourBox); - tqlayout->addStretch(); + layout->addWidget(mBgColourBox); + layout->addStretch(); TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox); mBgColourButton = new ColourCombo(mBgColourBox); label->setBuddy(mBgColourButton); TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color")); // Sound checkbox and file selector - tqlayout = new TQHBoxLayout(frameLayout); + layout = new TQHBoxLayout(frameLayout); mSoundPicker = new SoundPicker(mDisplayAlarmsFrame); mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); - tqlayout->addWidget(mSoundPicker); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mSoundPicker); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame); mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint()); - tqlayout->addWidget(mSpecialActionsButton); + layout->addWidget(mSpecialActionsButton); } // Top-adjust the controls @@ -505,19 +505,19 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame); frameLayout->addWidget(mCmdOutputGroup); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); // Execute in terminal window RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm"); button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window")); mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL); - tqlayout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(button, 0, TQt::AlignAuto); // Log file name edit box TQHBox* box = new TQHBox(mCmdOutputGroup); - (new TQWidget(box))->setFixedWidth(button->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // indent the edit box + (new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // indent the edit box // (new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth)); // indent the edit box mCmdLogFileEdit = new LineEdit(LineEdit::Url, box); mCmdLogFileEdit->setAcceptDrops(true); @@ -537,15 +537,15 @@ void EditAlarmDlg::initCommand(TQWidget* parent) TQWhatsThis::add(button, i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file.")); mCmdOutputGroup->insert(button, LOG_TO_FILE); - tqlayout->addWidget(button, 0, TQt::AlignAuto); - tqlayout->addWidget(box); + layout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(box); // Discard output button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard"); button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to discard command output.")); mCmdOutputGroup->insert(button, DISCARD_OUTPUT); - tqlayout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(button, 0, TQt::AlignAuto); // Top-adjust the controls mCmdPadding = new TQHBox(mCommandFrame); @@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent) { mEmailFrame = new TQFrame(parent); mEmailFrame->setFrameStyle(TQFrame::NoFrame); - TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); - TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint()); grid->setColStretch(1, 1); mEmailFromList = 0; @@ -614,10 +614,10 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email body mEmailMessageEdit = new TextEdit(mEmailFrame); TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message.")); - tqlayout->addWidget(mEmailMessageEdit); + layout->addWidget(mEmailMessageEdit); // Email attachments - grid = new TQGridLayout(tqlayout, 2, 3, spacingHint()); + grid = new TQGridLayout(layout, 2, 3, spacingHint()); label = new TQLabel(i18n("Attachment&s:"), mEmailFrame); label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0); diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 08bcce54..f75d5f6f 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -93,9 +93,9 @@ void Find::display() TQWidget* kalarmWidgets = mDialog->findExtension(); // Alarm types - TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); TQGroupBox* group = new TQGroupBox(i18n("Alarm Type"), kalarmWidgets); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); grid->addRowSpacing(0, mDialog->fontMetrics().lineSpacing()/2); grid->setColStretch(1, 1); diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index a59785c1..4273125a 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint()); } - TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout); + TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout); if (fg) { TQHBox* box = new TQHBox(page); // to group widgets for TQWhatsThis text @@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); label->setBuddy(mBgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message background color")); - htqlayout->addStretch(); + hlayout->addStretch(); if (editColours) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page); button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour())); TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list.")); - tqlayout->addWidget(button); + layout->addWidget(button); mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page); mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint()); connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour())); TQWhatsThis::add(mRemoveColourButton, i18n("Remove the color currently shown in the background color chooser, from the color selection list.")); - tqlayout->addWidget(mRemoveColourButton); + layout->addWidget(mRemoveColourButton); } if (defaultFont) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); mDefaultFont = new CheckBox(i18n("Use &default font"), page); mDefaultFont->setMinimumSize(mDefaultFont->sizeHint()); connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool))); TQWhatsThis::add(mDefaultFont, i18n("Check to use the default font current at the time the alarm is displayed.")); - tqlayout->addWidget(mDefaultFont); - tqlayout->addWidget(new TQWidget(page)); // left adjust the widget + layout->addWidget(mDefaultFont); + layout->addWidget(new TQWidget(page)); // left adjust the widget } else mDefaultFont = 0; diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 37fe5c99..6299049c 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -43,14 +43,14 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mReadOnly(false) { setFrameStyle(NoFrame); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); mButton = new PushButton(i18n("Font && Co&lor..."), this); mButton->setFixedSize(mButton->sizeHint()); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); - tqlayout->addWidget(mButton); + layout->addWidget(mButton); // Font and colour sample display mSample = new TQLineEdit(this); @@ -62,7 +62,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) TQWhatsThis::add(mSample, i18n("This sample text illustrates the current font and color settings. " "You may edit it to test special characters.")); - tqlayout->addWidget(mSample); + layout->addWidget(mSample); } void FontColourButton::setDefaultFont() @@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); @@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c mChooser->setDefaultFont(); else mChooser->setFont(font); - tqlayout->addWidget(mChooser); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mChooser); + layout->addSpacing(KDialog::spacingHint()); } /****************************************************************************** diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9fb76f21..0221ea86 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text) { unsigned len = text.length(); TQString out = TQDeepCopy(text); - TQChar *corig = (TQChar*)out.tqunicode(); + TQChar *corig = (TQChar*)out.unicode(); TQChar *cout = corig; TQChar *cin = cout; while (len) diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index da5cfe78..fa317c39 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -58,31 +58,31 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mCheckboxFrame = new TQFrame(mStack); mCheckboxFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mCheckboxFrame, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0); + TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0); mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame); mCheckbox->setFixedSize(mCheckbox->sizeHint()); connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); - tqlayout->addWidget(mCheckbox, 0, TQt::AlignAuto); + layout->addWidget(mCheckbox, 0, TQt::AlignAuto); mTimeSelectorFrame = new TQFrame(mStack); mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mTimeSelectorFrame, 2); - tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); + layout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - tqlayout->addWidget(mTimeSelector); + layout->addWidget(mTimeSelector); mLayout->addWidget(mStack); - tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + layout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); + layout->addSpacing(3*KDialog::spacingHint()); mAutoClose = new CheckBox(i18n_AutoCloseWin(), this); mAutoClose->setFixedSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, i18n("Automatically close the alarm window after the expiry of the late-cancelation period")); - tqlayout->addWidget(mAutoClose); - tqlayout->addStretch(); + layout->addWidget(mAutoClose); + layout->addStretch(); mAutoClose->hide(); mAutoClose->setEnabled(false); diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index ba03d07d..08fcf2c3 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -55,7 +55,7 @@ class LateCancelSelector : public TQFrame void slotToggled(bool); private: - TQBoxLayout* mLayout; // overall tqlayout for the widget + TQBoxLayout* mLayout; // overall layout for the widget TQWidgetStack* mStack; // contains mCheckboxFrame and mTimeSelectorFrame TQFrame* mCheckboxFrame; CheckBox* mCheckbox; // displayed when late cancellation is not selected diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 2eceec29..360d2a2a 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -87,7 +87,7 @@ void SpinBox2::init() setFocusProxy(mSpinbox); mUpdown2->setFocusPolicy(TQ_NoFocus); mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this); - if (!mirrorStyle(tqstyle())) + if (!mirrorStyle(style())) mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange())); connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); @@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step) { mLineStep = step; if (reverseButtons()) - mUpdown2->setLineStep(step); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(step); // reverse layout, but still set the right buttons else mSpinbox->setLineStep(step); } @@ -153,7 +153,7 @@ void SpinBox2::setSteps(int line, int page) mPageStep = page; if (reverseButtons()) { - mUpdown2->setLineStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineStep(page); } else @@ -169,7 +169,7 @@ void SpinBox2::setShiftSteps(int line, int page) mPageShiftStep = page; if (reverseButtons()) { - mUpdown2->setLineShiftStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineShiftStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineShiftStep(page); } else @@ -243,7 +243,7 @@ TQSize SpinBox2::minimumSizeHint() const void SpinBox2::styleChange(TQStyle&) { - if (mirrorStyle(tqstyle())) + if (mirrorStyle(style())) mSpinMirror->show(); // show rounded corners with Plastik etc. else mSpinMirror->hide(); // keep normal shading with other styles @@ -282,16 +282,16 @@ void SpinBox2::arrange() */ void SpinBox2::getMetrics() const { - TQRect rect = mUpdown2->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField); - if (tqstyle().inherits("PlastikStyle")) + TQRect rect = mUpdown2->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField); + if (style().inherits("PlastikStyle")) rect.setLeft(rect.left() - 1); // Plastik excludes left border from spin widget rectangle xUpdown2 = mReverseLayout ? 0 : rect.left(); wUpdown2 = mUpdown2->width() - rect.left(); - xSpinbox = mSpinbox->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left(); + xSpinbox = mSpinbox->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left(); wGap = 0; // Make style-specific adjustments for a better appearance - if (tqstyle().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING)) + if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING)) { xSpinbox = 0; // show the edit control left border wGap = 2; // leave a space to the right of the left-hand pair of spin buttons diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index 188cba52..14c2f16e 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -310,7 +310,7 @@ class SpinBox2 : public TQFrame int mLineShiftStep; // right button increment with shift pressed int mPageStep; // left button increment int mPageShiftStep; // left button increment with shift pressed - bool mReverseWithLayout; // reverse button positions if reverse tqlayout (default = true) + bool mReverseWithLayout; // reverse button positions if reverse layout (default = true) friend class MainSpinBox; }; diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index c1109b9d..2c9ac63e 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -298,13 +298,13 @@ void MessageWin::initView() { // Show the alarm date/time, together with an "Advance reminder" text where appropriate TQFrame* frame = 0; - TQVBoxLayout* tqlayout = topLayout; + TQVBoxLayout* layout = topLayout; if (reminder) { frame = new TQFrame(topWidget); frame->setFrameStyle(TQFrame::Box | TQFrame::Raised); topLayout->addWidget(frame, 0, TQt::AlignHCenter); - tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); + layout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); } // Alarm date/time @@ -315,7 +315,7 @@ void MessageWin::initView() if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); + layout->addWidget(label, 0, TQt::AlignHCenter); TQWhatsThis::add(label, i18n("The scheduled date/time for the message (as opposed to the actual time of display).")); @@ -324,7 +324,7 @@ void MessageWin::initView() label = new TQLabel(frame); label->setText(i18n("Reminder")); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); + layout->addWidget(label, 0, TQt::AlignHCenter); frame->setFixedSize(frame->sizeHint()); } } @@ -405,10 +405,10 @@ void MessageWin::initView() topLayout->addWidget(text, 1, TQt::AlignHCenter); else { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->addSpacing(hspace); - tqlayout->addWidget(text, 1, TQt::AlignHCenter); - tqlayout->addSpacing(hspace); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->addSpacing(hspace); + layout->addWidget(text, 1, TQt::AlignHCenter); + layout->addSpacing(hspace); } if (!reminder) topLayout->addStretch(); @@ -484,21 +484,21 @@ void MessageWin::initView() else { setCaption(i18n("Error")); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->setMargin(2*KDialog::marginHint()); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->setMargin(2*KDialog::marginHint()); + layout->addStretch(); TQLabel* label = new TQLabel(topWidget); label->setPixmap(DesktopIcon("error")); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignRight); - TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout); + layout->addWidget(label, 0, TQt::AlignRight); + TQBoxLayout* vlayout = new TQVBoxLayout(layout); for (TQStringList::Iterator it = mErrorMsgs.begin(); it != mErrorMsgs.end(); ++it) { label = new TQLabel(*it, topWidget); label->setFixedSize(label->sizeHint()); - vtqlayout->addWidget(label, 0, TQt::AlignLeft); + vlayout->addWidget(label, 0, TQt::AlignLeft); } - tqlayout->addStretch(); + layout->addStretch(); } TQGridLayout* grid = new TQGridLayout(1, 4); diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 3cde076b..b4174094 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -233,7 +233,7 @@ PrefsTabBase::PrefsTabBase(TQVBox* frame) mPage(frame) { if (!mIndentWidth) - mIndentWidth = tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, this).width(); + mIndentWidth = style().subRect(TQStyle::SR_RadioButtonIndicator, this).width(); } void PrefsTabBase::apply(bool syncToDisc) @@ -826,9 +826,9 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame) mPage->setStretchFactor(mFontChooser, 1); TQFrame* layoutBox = new TQFrame(mPage); - TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - htqlayout->addStretch(); + TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + hlayout->addStretch(); TQHBox* box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()/2); @@ -897,22 +897,22 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // DISPLAY ALARMS TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage); - TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); mConfirmAck->setMinimumSize(mConfirmAck->sizeHint()); TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck())); - tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); + layout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); mAutoClose->setMinimumSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin())); - tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); + layout->addWidget(mAutoClose, 0, TQt::AlignAuto); TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->addWidget(box); TQLabel* label = new TQLabel(i18n("Reminder &units:"), box); label->setFixedSize(label->sizeHint()); mReminderUnits = new TQComboBox(box, "defWarnUnits"); @@ -931,10 +931,10 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // SOUND TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup"); - tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); mSound = new TQComboBox(false, bgroup, "defSound"); mSound->insertItem(SoundPicker::i18n_None()); // index 0 mSound->insertItem(SoundPicker::i18n_Beep()); // index 1 @@ -943,14 +943,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSound->insertItem(SoundPicker::i18n_Speak()); // index 3 mSound->setMinimumSize(mSound->sizeHint()); TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound())); - htqlayout->addWidget(mSound); - htqlayout->addStretch(1); + hlayout->addWidget(mSound); + hlayout->addStretch(1); #ifndef WITHOUT_ARTS mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound"); mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint()); TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat())); - htqlayout->addWidget(mSoundRepeat); + hlayout->addWidget(mSoundRepeat); #endif box = new TQHBox(bgroup); // this is to control the TQWhatsThis text display area @@ -967,36 +967,36 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQWhatsThis::add(box, i18n("Enter the default sound file to use in the alarm edit dialog.")); box->setFixedHeight(box->sizeHint().height()); - tqlayout->addWidget(box); + layout->addWidget(box); bgroup->setFixedHeight(bgroup->sizeHint().height()); // COMMAND ALARMS group = new TQGroupBox(i18n("Command Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); - tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); + layout = new TQHBoxLayout(layout, KDialog::spacingHint()); mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript"); mCmdScript->setMinimumSize(mCmdScript->sizeHint()); TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript())); - tqlayout->addWidget(mCmdScript); - tqlayout->addStretch(); + layout->addWidget(mCmdScript); + layout->addStretch(); mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm"); mCmdXterm->setMinimumSize(mCmdXterm->sizeHint()); TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow())); - tqlayout->addWidget(mCmdXterm); + layout->addWidget(mCmdXterm); // EMAIL ALARMS group = new TQGroupBox(i18n("Email Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); // BCC email to sender mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); mEmailBcc->setMinimumSize(mEmailBcc->sizeHint()); TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf())); - tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto); + layout->addWidget(mEmailBcc, 0, TQt::AlignAuto); // MISCELLANEOUS // Show in KOrganizer diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 0e872704..216c1f47 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mNoEmitTypeChanged(true), mReadOnly(readOnly) { - TQBoxLayout* tqlayout; + TQBoxLayout* layout; TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); /* Create the recurrence rule Group box which holds the recurrence period @@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); - tqlayout = new TQVBoxLayout(ruleFrame, 0); - tqlayout->addSpacing(KDialog::spacingHint()/2); + layout = new TQVBoxLayout(ruleFrame, 0); + layout->addSpacing(KDialog::spacingHint()/2); - tqlayout = new TQHBoxLayout(tqlayout, 0); - TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0); + layout = new TQHBoxLayout(layout, 0); + TQBoxLayout* lay = new TQVBoxLayout(layout, 0); mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); @@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name lay->addSpacing(KDialog::spacingHint()); lay->addWidget(mSubRepetition); - lay = new TQVBoxLayout(tqlayout); + lay = new TQVBoxLayout(layout); lay->addStretch(); - tqlayout = new TQHBoxLayout(lay); + layout = new TQHBoxLayout(lay); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); TQFrame* divider = new TQFrame(ruleFrame); divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); - tqlayout->addWidget(divider); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addWidget(divider); + layout->addSpacing(KDialog::marginHint()); mNoRule = new NoRule(ruleFrame, "noFrame"); mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame"); @@ -203,15 +203,15 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); mRuleStack = new TQWidgetStack(ruleFrame); - tqlayout->addWidget(mRuleStack); - tqlayout->addStretch(1); + layout->addWidget(mRuleStack); + layout->addStretch(1); mRuleStack->addWidget(mNoRule, 0); mRuleStack->addWidget(mSubDailyRule, 1); mRuleStack->addWidget(mDailyRule, 2); mRuleStack->addWidget(mWeeklyRule, 3); mRuleStack->addWidget(mMonthlyRule, 4); mRuleStack->addWidget(mYearlyRule, 5); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); // Create the recurrence range group which contains the controls // which specify how long the recurrence is to last. @@ -220,16 +220,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked())); topLayout->addWidget(mRangeButtonGroup); - TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->addSpacing(fontMetrics().lineSpacing()/2); mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup); mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint()); mNoEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely")); - vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); + vlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); TQSize size = mNoEndDateButton->size(); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup); mRepeatCountButton->setReadOnly(mReadOnly); TQWhatsThis::add(mRepeatCountButton, @@ -245,14 +245,14 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRepeatCountButton->setFocusWidget(mRepeatCountEntry); mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup); mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint()); - tqlayout->addWidget(mRepeatCountButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mRepeatCountEntry); - tqlayout->addWidget(mRepeatCountLabel); - tqlayout->addStretch(); + layout->addWidget(mRepeatCountButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mRepeatCountEntry); + layout->addWidget(mRepeatCountLabel); + layout->addStretch(); size = size.expandedTo(mRepeatCountButton->sizeHint()); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup); mEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mEndDateButton, @@ -275,12 +275,12 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mEndAnyTimeCheckBox, i18n("Stop repeating the alarm after your first login on or after the specified end date")); - tqlayout->addWidget(mEndDateButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mEndDateEdit); - tqlayout->addWidget(mEndTimeEdit); - tqlayout->addWidget(mEndAnyTimeCheckBox); - tqlayout->addStretch(); + layout->addWidget(mEndDateButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mEndDateEdit); + layout->addWidget(mEndTimeEdit); + layout->addWidget(mEndAnyTimeCheckBox); + layout->addStretch(); size = size.expandedTo(mEndDateButton->sizeHint()); // Line up the widgets to the right of the radio buttons @@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup"); topLayout->addWidget(mExceptionGroup); topLayout->setStretchFactor(mExceptionGroup, 2); - vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->addSpacing(fontMetrics().lineSpacing()/2); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); + vlayout = new TQVBoxLayout(layout); mExceptionDateList = new TQListBox(mExceptionGroup); mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons())); TQWhatsThis::add(mExceptionDateList, i18n("The list of exceptions, i.e. dates/times excluded from the recurrence")); - vtqlayout->addWidget(mExceptionDateList); + vlayout->addWidget(mExceptionDateList); if (mReadOnly) { @@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name } else { - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(layout); mExceptionDateEdit = new DateEdit(mExceptionGroup); mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint()); mExceptionDateEdit->setDate(TQDate::currentDate()); TQWhatsThis::add(mExceptionDateEdit, i18n("Enter a date to insert in the exceptions list. " "Use in conjunction with the Add or Change button below.")); - vtqlayout->addWidget(mExceptionDateEdit); + vlayout->addWidget(mExceptionDateEdit); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup); button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException())); TQWhatsThis::add(button, i18n("Add the date entered above to the exceptions list")); - tqlayout->addWidget(button); + layout->addWidget(button); mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup); mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint()); connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException())); TQWhatsThis::add(mChangeExceptionButton, i18n("Replace the currently highlighted item in the exceptions list with the date entered above")); - tqlayout->addWidget(mChangeExceptionButton); + layout->addWidget(mChangeExceptionButton); mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup); mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint()); connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException())); TQWhatsThis::add(mDeleteExceptionButton, i18n("Remove the currently highlighted item from the exceptions list")); - tqlayout->addWidget(mDeleteExceptionButton); + layout->addWidget(mDeleteExceptionButton); } mNoEmitTypeChanged = false; @@ -1112,7 +1112,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), mSavedDays(7) { - TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint()); grid->setRowStretch(0, 1); TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this); @@ -1258,7 +1258,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats // Month day selector TQHBox* box = new TQHBox(this); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->addWidget(box); mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box); mDayButton->setFixedSize(mDayButton->sizeHint()); @@ -1283,7 +1283,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats // Month position selector box = new TQHBox(this); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->addWidget(box); mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box); mPosButton->setFixedSize(mPosButton->sizeHint()); @@ -1456,14 +1456,14 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) true, readOnly, parent, name) { // Set up the month selection widgets - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this); label->setFixedSize(label->sizeHint()); - htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); + hlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); // List the months of the year. TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area - htqlayout->addWidget(w, 1, TQt::AlignAuto); + hlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); const KCalendarSystem* calendar = KGlobal::locale()->calendar(); int year = TQDate::currentDate().year(); @@ -1480,7 +1480,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) // February 29th handling option TQHBox* f29box = new TQHBox(this); - tqlayout()->addWidget(f29box); + layout()->addWidget(f29box); TQHBox* box = new TQHBox(f29box); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box); diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h index 68dd429b..94472c37 100644 --- a/kalarm/recurrenceeditprivate.h +++ b/kalarm/recurrenceeditprivate.h @@ -54,7 +54,7 @@ class Rule : public NoRule int frequency() const; void setFrequency(int); virtual void setFrequencyFocus() { mSpinBox->setFocus(); } - TQVBoxLayout* tqlayout() const { return mLayout; } + TQVBoxLayout* layout() const { return mLayout; } virtual TQWidget* validate(TQString&) { return 0; } virtual void saveState(); virtual bool stateChanged() const; diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index 2fd2ff79..60c60336 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -57,13 +57,13 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c if (showOnceOnly) { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->addSpacing(3*KDialog::spacingHint()); mOnceOnly = new CheckBox(i18n_u_first_recurrence_only(), this); mOnceOnly->setFixedSize(mOnceOnly->sizeHint()); TQWhatsThis::add(mOnceOnly, i18n("Display the reminder only before the first time the alarm is scheduled")); - tqlayout->addWidget(mOnceOnly); - tqlayout->addStretch(); + layout->addWidget(mOnceOnly); + layout->addStretch(); } else mOnceOnly = 0; diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index d5eae1a8..45de81cb 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -174,13 +174,13 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); topLayout->addWidget(mButtonGroup); - TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); - TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing); + TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); + TQBoxLayout* layout = new TQHBoxLayout(vlayout, spacing); mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup); mCountButton->setFixedSize(mCountButton->sizeHint()); TQWhatsThis::add(mCountButton, i18n("Check to specify the number of times the alarm should repeat after each recurrence")); - tqlayout->addWidget(mCountButton); + layout->addWidget(mCountButton); mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup); mCount->setFixedSize(mCount->sizeHint()); mCount->setLineShiftStep(10); @@ -188,24 +188,24 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int))); TQWhatsThis::add(mCount, i18n("Enter the number of times to trigger the alarm after its initial occurrence")); - tqlayout->addWidget(mCount); + layout->addWidget(mCount); mCountButton->setFocusWidget(mCount); - tqlayout->addStretch(); + layout->addStretch(); - tqlayout = new TQHBoxLayout(vtqlayout, spacing); + layout = new TQHBoxLayout(vlayout, spacing); mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup); mDurationButton->setFixedSize(mDurationButton->sizeHint()); TQWhatsThis::add(mDurationButton, i18n("Check to specify how long the alarm is to be repeated")); - tqlayout->addWidget(mDurationButton); + layout->addWidget(mDurationButton); mDuration = new TimePeriod(true, mButtonGroup); mDuration->setFixedSize(mDuration->sizeHint()); connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int))); TQWhatsThis::add(mDuration, i18n("Enter the length of time to repeat the alarm")); - tqlayout->addWidget(mDuration); + layout->addWidget(mDuration); mDurationButton->setFocusWidget(mDuration); - tqlayout->addStretch(); + layout->addStretch(); mCountButton->setChecked(true); repetitionToggled(false); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 77894b7a..b02e9fc2 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -78,11 +78,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); // File play button TQHBox* box = new TQHBox(page); - tqlayout->addWidget(box); + layout->addWidget(box); mFilePlay = new TQPushButton(box); mFilePlay->setPixmap(SmallIcon("player_play")); mFilePlay->setFixedSize(mFilePlay->sizeHint()); @@ -108,11 +108,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint()); TQWhatsThis::add(mRepeatCheckbox, i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed.")); - tqlayout->addWidget(mRepeatCheckbox); + layout->addWidget(mRepeatCheckbox); // Volume TQGroupBox* group = new TQGroupBox(i18n("Volume"), page); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint()); grid->setColStretch(2, 1); diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index d4271d16..bb632252 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -95,12 +95,12 @@ SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mActions = new SpecialActions(page); mActions->setActions(preAction, postAction); - tqlayout->addWidget(mActions); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mActions); + layout->addSpacing(KDialog::spacingHint()); TQSize s; if (KAlarm::readConfigWindowSize(SPEC_ACT_DIALOG_NAME, s)) diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 698077bf..2841ce61 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQBoxLayout* topLayout = new TQHBoxLayout(topWidget); topLayout->setSpacing(spacingHint()); - TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout); + TQBoxLayout* layout = new TQVBoxLayout(topLayout); mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget); mTemplateList->setSelectionMode(TQListView::Extended); mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - tqlayout->addWidget(mTemplateList); + layout->addWidget(mTemplateList); - tqlayout = new TQVBoxLayout(topLayout); + layout = new TQVBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew())); TQWhatsThis::add(button, i18n("Create a new alarm template")); - tqlayout->addWidget(button); + layout->addWidget(button); mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template")); - tqlayout->addWidget(mEditButton); + layout->addWidget(mEditButton); mCopyButton = new TQPushButton(i18n("Co&py"), topWidget); connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy())); TQWhatsThis::add(mCopyButton, i18n("Create a new alarm template based on a copy of the currently highlighted template")); - tqlayout->addWidget(mCopyButton); + layout->addWidget(mCopyButton); mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget); connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); - tqlayout->addWidget(mDeleteButton); + layout->addWidget(mDeleteButton); KAccel* accel = new KAccel(this); accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 1ca20bc1..9ec5c981 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -41,16 +41,16 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, { setFrameStyle(TQFrame::NoFrame); TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); mSelect = new CheckBox(selectText, this); mSelect->setFixedSize(mSelect->sizeHint()); connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool))); TQWhatsThis::add(mSelect, selectWhatsThis); - tqlayout->addWidget(mSelect); + layout->addWidget(mSelect); TQHBox* box = new TQHBox(this); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->addWidget(box); mPeriod = new TimePeriod(allowHourMinute, box); mPeriod->setFixedSize(mPeriod->sizeHint()); mPeriod->setSelectOnStep(false); diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui index 1d885740..9140a2a9 100644 --- a/kandy/src/mobilegui_base.ui +++ b/kandy/src/mobilegui_base.ui @@ -318,7 +318,7 @@     - tqlayout21 + layout21 diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 01d38416..879386ad 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -63,14 +63,14 @@ protected: KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) : TQWidget(parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); _hourLE = new TQLineEdit( this); // 9999 hours > 1 year! // 999 hours = 41 days (That should be enough ...) _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3 + 2 * _hourLE->frameWidth() + 2); - tqlayout->addWidget(_hourLE); + layout->addWidget(_hourLE); TimeValidator *validator = new TimeValidator( HOUR, _hourLE, "Validator for _hourLE"); _hourLE->setValidator( validator ); @@ -78,23 +78,23 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this ); - tqlayout->addWidget( hr ); + layout->addWidget( hr ); _minuteLE = new KarmLineEdit(this); // Minutes lineedit: Make room for 2 digits _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2 + 2 * _minuteLE->frameWidth() + 2); - tqlayout->addWidget(_minuteLE); + layout->addWidget(_minuteLE); validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE"); _minuteLE->setValidator( validator ); _minuteLE->setMaxLength(2); _minuteLE->setAlignment( TQt::AlignRight ); TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this ); - tqlayout->addWidget( min ); + layout->addWidget( min ); - tqlayout->addStretch(1); + layout->addStretch(1); setFocusProxy( _hourLE ); } diff --git a/karm/preferences.cpp b/karm/preferences.cpp index e187599f..c242fa6a 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -51,8 +51,8 @@ void Preferences::makeBehaviorPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( behaviorPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 2, 2 ); + layout->setColStretch( 1, 1 ); _doIdleDetectionW = new TQCheckBox ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW"); @@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage() _promptDeleteW = new TQCheckBox ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" ); - tqlayout->addWidget(_doIdleDetectionW, 0, 0 ); - tqlayout->addWidget(_idleDetectValueW, 0, 1 ); - tqlayout->addWidget(_promptDeleteW, 1, 0 ); + layout->addWidget(_doIdleDetectionW, 0, 0 ); + layout->addWidget(_idleDetectValueW, 0, 1 ); + layout->addWidget(_promptDeleteW, 1, 0 ); topLevel->addStretch(); @@ -79,8 +79,8 @@ void Preferences::makeDisplayPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 ); + layout->setColStretch( 1, 1 ); TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"), displayPage ); @@ -93,11 +93,11 @@ void Preferences::makeDisplayPage() _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"), displayPage, "_displayTotalTimeW"); - tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); - tqlayout->addWidget(_displaySessionW, 1, 1 ); - tqlayout->addWidget(_displayTimeW, 2, 1 ); - tqlayout->addWidget(_displayTotalSessionW, 3, 1 ); - tqlayout->addWidget(_displayTotalTimeW, 4, 1 ); + layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); + layout->addWidget(_displaySessionW, 1, 1 ); + layout->addWidget(_displayTimeW, 2, 1 ); + layout->addWidget(_displayTotalSessionW, 3, 1 ); + layout->addWidget(_displayTotalTimeW, 4, 1 ); topLevel->addStretch(); } @@ -109,8 +109,8 @@ void Preferences::makeStoragePage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 ); + layout->setColStretch( 1, 1 ); // autosave _doAutoSaveW = new TQCheckBox @@ -128,12 +128,12 @@ void Preferences::makeStoragePage() _loggingW = new TQCheckBox ( i18n("Log history"), storagePage, "_loggingW" ); - // add widgets to tqlayout - tqlayout->addWidget(_doAutoSaveW, 0, 0); - tqlayout->addWidget(_autoSaveValueW, 0, 1); - tqlayout->addWidget(_iCalFileLabel, 1, 0 ); - tqlayout->addWidget(_iCalFileW, 1, 1 ); - tqlayout->addWidget(_loggingW, 2, 0 ); + // add widgets to layout + layout->addWidget(_doAutoSaveW, 0, 0); + layout->addWidget(_autoSaveValueW, 0, 1); + layout->addWidget(_iCalFileLabel, 1, 0 ); + layout->addWidget(_iCalFileW, 1, 1 ); + layout->addWidget(_loggingW, 2, 0 ); topLevel->addStretch(); diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 0813ca34..e4dfe30e 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -48,14 +48,14 @@ PrintDialog::PrintDialog() setMainWidget(page); int year, month; - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); + layout->addSpacing(10); + layout->addStretch(1); // Date Range TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"), page); - tqlayout->addWidget(rangeGroup); + layout->addWidget(rangeGroup); TQWidget *rangeWidget = new TQWidget(rangeGroup); TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint()); @@ -72,21 +72,21 @@ PrintDialog::PrintDialog() _to = new KDateEdit(rangeWidget); rangeLayout->addWidget(_to); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); _allTasks = new TQComboBox( page ); _allTasks->insertItem( i18n( "Selected Task" ) ); _allTasks->insertItem( i18n( "All Tasks" ) ); - tqlayout->addWidget( _allTasks ); + layout->addWidget( _allTasks ); _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page ); - tqlayout->addWidget( _perWeek ); + layout->addWidget( _perWeek ); _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page ); - tqlayout->addWidget( _totalsOnly ); + layout->addWidget( _totalsOnly ); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); } TQDate PrintDialog::from() const diff --git a/karm/taskview.cpp b/karm/taskview.cpp index a7aff406..929541ac 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -820,16 +820,16 @@ void TaskView::clipTotals() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // This task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } else // All tasks { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } } @@ -844,16 +844,16 @@ void TaskView::clipSession() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // this task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } else // only task { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } } @@ -863,7 +863,7 @@ void TaskView::clipHistory() if (dialog.exec()== TQDialog::Accepted) { TimeKard t; - KApplication::tqclipboard()-> + KApplication::clipboard()-> setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) ); } } diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index 1d809bdf..7a24bd3d 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -96,7 +96,7 @@ if ($argv[1]!="--batch") echo "(b) make sure the code still builds (make)\n"; echo "(c) run automated test routines like this (make check)\n\n"; - echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardtqlayout (setxkbmap us). This must be run in X environment.\n + echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardlayout (setxkbmap us). This must be run in X environment.\n You must have XAutomation installed to run this."; system("xte -h 2&>/dev/null",$rc); if ($rc==0) echo " You have.\n"; diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index fb9eda89..76d6e988 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -241,7 +241,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) p.setBrush( colorGroup().background() ); p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); - parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), + parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size @@ -256,8 +256,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); p.drawPolygon( *it, true ); p.restore(); } @@ -561,7 +561,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient == Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -601,7 +601,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -632,7 +632,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const close as possible to position \a p, which is the distance from the left (or top) edge of the widget. - For Arabic and Hebrew the tqlayout is reversed, and using this + For Arabic and Hebrew the layout is reversed, and using this function to set the position of the splitter might lead to unexpected results, since in Arabic and Hebrew the position of splitter one is to the left of the position of splitter zero. @@ -837,7 +837,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) } TQRect r = contentsRect(); if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -1229,7 +1229,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const splitter. Giving the values to another splitter's setSizes() function will - produce a splitter with the same tqlayout as this one. + produce a splitter with the same layout as this one. Note that if you want to iterate over the list, you should iterate over a copy, e.g. @@ -1309,7 +1309,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 199fb2c7..dcc2f40d 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -249,7 +249,7 @@ void KDGanttSemiSizingControl::init() _but = new TQPushButton( this ); _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); - _tqlayout = 0; + _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); @@ -258,19 +258,19 @@ void KDGanttSemiSizingControl::init() void KDGanttSemiSizingControl::setup() { - //-------------------------------------------------- Setup tqlayout - delete _tqlayout; - TQBoxLayout* butLayout; // _tqlayout will delete me + //-------------------------------------------------- Setup layout + delete _layout; + TQBoxLayout* butLayout; // _layout will delete me if ( _orient == Qt::Horizontal || isMinimized() ) - _tqlayout = new TQHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); else - _tqlayout = new TQVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); if ( _orient == Qt::Vertical && !isMinimized() ) - butLayout = new TQHBoxLayout( _tqlayout ); + butLayout = new TQHBoxLayout( _layout ); else - butLayout = new TQVBoxLayout( _tqlayout ); + butLayout = new TQVBoxLayout( _layout ); @@ -306,9 +306,9 @@ void KDGanttSemiSizingControl::setup() widget = _maximizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } ************************************************** */ // hack for the usage in KDGantt as pop-up legend widget @@ -319,16 +319,16 @@ void KDGanttSemiSizingControl::setup() widget = _minimizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } } else { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addStretch( 1 ); + _layout->addStretch( 1 ); else - _tqlayout->insertStretch( 0, 1 ); + _layout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case // arrowPos == Before and _orient == Qt::Vertical diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index c1cc0b59..34b11a23 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -83,7 +83,7 @@ private: ArrowPosition _arrowPos; TQWidget* _minimizedWidget; TQWidget* _maximizedWidget; - TQBoxLayout* _tqlayout; + TQBoxLayout* _layout; TQPushButton* _but; }; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 9598f867..bb797cc7 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -4239,7 +4239,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const may add as many widgets as you want. They are ordered horizontally from left to right. To remove a widget from the spacer widget, call widget->reparent(newParent,...) or delete the widget. Since the spacer - is a TQHBox, the tqlayout of the added widgets is managed by this + is a TQHBox, the layout of the added widgets is managed by this TQHBox. \param w A pointer to the widget to be added. diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 77bc4db7..859a4b59 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -1487,7 +1487,7 @@ void KDTimeHeaderWidget::computeIntervals( int height ) { IntervalColorList::const_iterator it; for ( it = icList.begin(); it != icList.end(); ++it ) { - (*it)->tqlayout( this, height ); + (*it)->layout( this, height ); } } @@ -2652,7 +2652,7 @@ void KDLegendWidget::clearLegend ( ) myLegend->setFont( font() ); scroll->addChild( myLegend ); scroll->setResizePolicy( TQScrollView::AutoOneFit ); - myLegend->tqlayout()->setMargin( 11 ); + myLegend->layout()->setMargin( 11 ); myLegend->setFrameStyle( TQFrame::NoFrame ); if ( dock ) scroll->setMaximumHeight( 32000 ); @@ -2884,7 +2884,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -4018,7 +4018,7 @@ void KDIntervalColorRectangle::setColor( const TQColor& color ) /*! \internal */ -void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int height ) +void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int height ) { int left = timeHeader->getCoordX(mStart); int right = timeHeader->getCoordX(mEnd); diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index a2180850..30ed39d4 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -471,7 +471,7 @@ public: enum HitTest { Start, Middle, End }; HitTest hitTest( KDTimeHeaderWidget* timeHeader, const TQPoint& pos ) const; - void tqlayout( KDTimeHeaderWidget* timeHeader, int height ); + void layout( KDTimeHeaderWidget* timeHeader, int height ); static const int RTTI = 0x0c58; /*reimp*/ int rtti() const { return RTTI; } diff --git a/kioslaves/imap4/mailheader.h b/kioslaves/imap4/mailheader.h index 72ac6e48..633d61b7 100644 --- a/kioslaves/imap4/mailheader.h +++ b/kioslaves/imap4/mailheader.h @@ -94,7 +94,7 @@ public: } /** - * set a tqunicode subject + * set a unicode subject */ void setSubject (const TQString & _str) { @@ -109,7 +109,7 @@ public: } /** - * get the tqunicode subject + * get the unicode subject */ const TQString getSubject () { diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 723f2974..6d884f9f 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -51,7 +51,7 @@ static TQString readFile( const TQString &fileName ) AboutPage::AboutPage( TQWidget *parent ) : TQWidget( parent, "AboutPage" ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQString location = locate( "data", "kitchensync/about/main.html" ); TQString content = readFile( location ); @@ -62,7 +62,7 @@ AboutPage::AboutPage( TQWidget *parent ) content = content.arg( "" ); KHTMLPart *part = new KHTMLPart( this ); - tqlayout->addWidget( part->view() ); + layout->addWidget( part->view() ); part->begin( KURL( location ) ); diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 716bce78..c313ce3a 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const void ConfigGuiEvo2::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 ); mAddressPath = new KURLRequester( this ); mAddressPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 ); mCalendarPath = new KURLRequester( this ); mCalendarPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 ); mTasksPath = new KURLRequester( this ); mTasksPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 ); } diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index 84db0275..38f2fbf3 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -37,14 +37,14 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); // Model TQLabel *label = new TQLabel( i18n("Model:"), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mModel = new KComboBox( true, this ); - tqlayout->addWidget( mModel, 0, 1 ); + layout->addWidget( mModel, 0, 1 ); mModel->insertItem( "2110" ); mModel->insertItem( "3110" ); mModel->insertItem( "6110" ); @@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent // Connection label = new TQLabel( i18n("Connection:"), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mConnection = new TQComboBox( this ); - tqlayout->addWidget( mConnection, 1, 1 ); + layout->addWidget( mConnection, 1, 1 ); connect( mConnection, TQT_SIGNAL (activated( int ) ), this, TQT_SLOT( slotConnectionChanged ( int ) ) ); @@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent mBluetooth = new BluetoothWidget( connectionWidget ); mBluetooth->hide(); - tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 ); + layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 ); // Port mPortLabel = new TQLabel( i18n("Port:"), this ); - tqlayout->addWidget( mPortLabel, 2, 0 ); + layout->addWidget( mPortLabel, 2, 0 ); mPortLabel->hide(); mPort = new KComboBox( true, this ); - tqlayout->addWidget( mPort, 2, 1 ); + layout->addWidget( mPort, 2, 1 ); mPort->hide(); mPort->insertItem( "/dev/ircomm0" ); @@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent mPort->insertItem( "/dev/ttyUSB0" ); mPort->insertItem( "/dev/ttyUSB1" ); - tqlayout->setColStretch( 1, 1 ); + layout->setColStretch( 1, 1 ); topLayout()->addStretch( 1 ); } diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index c6e6627f..1a5cdb14 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const void ConfigGuiGpe::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); mConnectionMode = new KComboBox( this ); - tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 ); + layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 ); mIP = new KLineEdit( this ); mIP->setInputMask( "000.000.000.000" ); - tqlayout->addWidget( mIP, 1, 1 ); + layout->addWidget( mIP, 1, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight ); + layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight ); mPort = new TQSpinBox( 1, 65536, 1, this ); - tqlayout->addWidget( mPort, 1, 3 ); + layout->addWidget( mPort, 1, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 ); mUser = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 ); + layout->addMultiCellWidget( mUser, 2, 2, 1, 3 ); } diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index 158eb225..2b37ad42 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const void ConfigGuiJescs::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 ); mUrl = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 ); mUsername = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 ); mPassword = new KLineEdit( this ); mPassword->setEchoMode( KLineEdit::Password ); - tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 ); mDelNotify = new TQCheckBox( this ); mDelNotify->setText( "Notify attendees about event/task deletion" ); - tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 ); + layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 ); } diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index 417e58d0..3ef451c3 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const void ConfigGuiLdap::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST | KABC::LdapConfigWidget::W_PORT | @@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI() mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this ); mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this ); - tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); - tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 ); - tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 ); - tqlayout->addWidget( mEncryption, 12, 0 ); - tqlayout->addWidget( mReadLdap, 13, 0 ); - tqlayout->addWidget( mWriteLdap, 13, 3 ); + layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 ); + layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); + layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 ); + layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 ); + layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 ); + layout->addWidget( mEncryption, 12, 0 ); + layout->addWidget( mReadLdap, 13, 0 ); + layout->addWidget( mWriteLdap, 13, 3 ); } diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index c44a2b40..a310692f 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const void ConfigGuiMoto::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 ); mDeviceString = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 ); } diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index 64bd816f..39a7ea77 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -33,52 +33,52 @@ ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); TQLabel *label = new TQLabel( i18n("Device IP:"), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mDeviceIP = new TQLineEdit( this ); mDeviceIP->setInputMask( "000.000.000.000" ); label->setBuddy( mDeviceIP ); - tqlayout->addWidget( mDeviceIP, 0, 1 ); + layout->addWidget( mDeviceIP, 0, 1 ); label = new TQLabel( i18n("Device Type:"), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mDeviceType = new TQComboBox( this ); label->setBuddy( mDeviceType ); - tqlayout->addWidget( mDeviceType, 1, 1 ); + layout->addWidget( mDeviceType, 1, 1 ); label = new TQLabel( i18n("Username:"), this ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mUserName = new TQLineEdit( this ); label->setBuddy( mUserName ); - tqlayout->addWidget( mUserName, 2, 1 ); + layout->addWidget( mUserName, 2, 1 ); label = new TQLabel( i18n("Password:"), this ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mPassword = new TQLineEdit( this ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( mPassword, 3, 1 ); + layout->addWidget( mPassword, 3, 1 ); label = new TQLabel( i18n("Protocol:"), this ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mConnectionType = new TQComboBox( this ); label->setBuddy( mConnectionType ); - tqlayout->addWidget( mConnectionType, 4, 1 ); + layout->addWidget( mConnectionType, 4, 1 ); label = new TQLabel( i18n("Port:"), this ); - tqlayout->addWidget( label, 5, 0 ); + layout->addWidget( label, 5, 0 ); mPort = new TQSpinBox( this ); mPort->setRange( 0, 65335 ); label->setBuddy( mPort ); - tqlayout->addWidget( mPort, 5, 1 ); + layout->addWidget( mPort, 5, 1 ); mDeviceType->insertItem( i18n("Opie/OpenZaurus") ); mDeviceType->insertItem( i18n("TQtopia2") ); diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index b83e8568..6e521bee 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const void ConfigGuiSynce::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); mContacts = new TQCheckBox( this ); mContacts->setText( "Sync Contacts" ); - tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 ); mTodos = new TQCheckBox( this ); mTodos->setText( "Sync \'Todo\' items" ); - tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 ); mCalendar = new TQCheckBox( this ); mCalendar->setText( "Sync Calendar" ); - tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 ); mFile = new KLineEdit( this ); - tqlayout->addWidget( mFile, 3, 1 ); + layout->addWidget( mFile, 3, 1 ); } diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index bb25c271..ac5277fb 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -43,24 +43,24 @@ BluetoothWidget::BluetoothWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this ); + TQGridLayout *layout = new TQGridLayout( this ); mAddress = new KLineEdit( this ); mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" ); - tqlayout->addWidget( mAddress, 1, 0 ); + layout->addWidget( mAddress, 1, 0 ); TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this ); label->setBuddy( mAddress ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mChannel = new KLineEdit( this ); - tqlayout->addWidget( mChannel, 1, 1 ); + layout->addWidget( mChannel, 1, 1 ); mChannelLabel = new TQLabel( i18n( "Channel:" ), this ); mChannelLabel->setBuddy( mChannel ); - tqlayout->addWidget( mChannelLabel, 0, 1 ); + layout->addWidget( mChannelLabel, 0, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void BluetoothWidget::hideChannel() @@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const IRWidget::IRWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 ); mDevice = new KLineEdit( this ); mSerialNumber = new KLineEdit( this ); - tqlayout->addWidget( mDevice, 1, 0 ); - tqlayout->addWidget( mSerialNumber, 1, 1 ); + layout->addWidget( mDevice, 1, 0 ); + layout->addWidget( mSerialNumber, 1, 1 ); TQLabel *label = new TQLabel( i18n( "Device Name:" ), this ); label->setBuddy( mDevice ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Serial Number:" ), this ); label->setBuddy( mSerialNumber ); - tqlayout->addWidget( label, 0, 1 ); + layout->addWidget( label, 0, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void IRWidget::load( const TQDomElement &parent ) @@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent ) CableWidget::CableWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 ); mManufacturer = new KComboBox( this ); mDevice = new KComboBox( true, this ); - tqlayout->addWidget( mManufacturer, 0, 1 ); - tqlayout->addWidget( mDevice, 1, 1 ); + layout->addWidget( mManufacturer, 0, 1 ); + layout->addWidget( mDevice, 1, 1 ); TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this ); label->setBuddy( mManufacturer ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Device:" ), this ); label->setBuddy( mDevice ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) ); mManufacturer->insertItem( i18n( "Siemens" ) ); @@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent ) UsbWidget::UsbWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3); mInterface = new TQSpinBox( this ); - tqlayout->addWidget( mInterface, 0, 1 ); + layout->addWidget( mInterface, 0, 1 ); TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this ); label->setBuddy( mInterface ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void UsbWidget::setInterface( int interface ) diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index 5a0cf49d..b418af56 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -41,8 +41,8 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = new TQGridLayout( this ); + layout->setMargin( 0 ); const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion(); @@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) continue; TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this ); - tqlayout->addWidget( objectCheckBox, row, col ); + layout->addWidget( objectCheckBox, row, col ); mObjectTypeChecks.insert( objectType, objectCheckBox ); col++; @@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group ) GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 ); mGroupName = new KLineEdit( this ); - tqlayout->addWidget( mGroupName, 0, 1 ); + layout->addWidget( mGroupName, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop ); + layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop ); mObjectTypeSelector = new ObjectTypeSelector( this ); - tqlayout->addWidget( mObjectTypeSelector, 1, 1 ); + layout->addWidget( mObjectTypeSelector, 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess ) diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 5409fc17..08b12625 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) boldFont.setBold( true ); boldFont.setPointSize( boldFont.pointSize() + 2 ); - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); mBox = new TQVBox( this ); mBox->setMargin( 5 ); @@ -93,16 +93,16 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) hbox->setPaletteBackgroundColor( colorGroup().mid() ); hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); - tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); - tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 ); - tqlayout->addWidget( mTime, 2, 0 ); - tqlayout->addWidget( mSyncAction, 2, 1 ); - tqlayout->addWidget( mConfigureAction, 2, 2 ); - tqlayout->addWidget( mProgressBar, 2, 3 ); - tqlayout->setColStretch( 0, 1 ); - tqlayout->setRowStretch( 3, 1 ); + layout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); + layout->addMultiCellWidget( mBox, 1, 1, 0, 3 ); + layout->addWidget( mTime, 2, 0 ); + layout->addWidget( mSyncAction, 2, 1 ); + layout->addWidget( mConfigureAction, 2, 2 ); + layout->addWidget( mProgressBar, 2, 3 ); + layout->setColStretch( 0, 1 ); + layout->setRowStretch( 3, 1 ); - setPaletteBackgroundColor( kapp->tqpalette().active().base() ); + setPaletteBackgroundColor( kapp->palette().active().base() ); connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ), this, TQT_SLOT( conflict( QSync::SyncMapping ) ) ); @@ -358,12 +358,12 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, QSync::Plugin plugin = member.plugin(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQHBox* box = new TQHBox( this ); box->setMargin( 5 ); box->setSpacing( 6 ); - tqlayout->addWidget( box ); + layout->addWidget( box ); mIcon = new TQLabel( box ); mIcon->setPixmap( icon ); diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index e7c03761..7d7805c4 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem : KWidgetListItem( parent ), mChange( change ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); MemberInfo mi( change.member() ); - tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); + layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); TQString type; switch ( change.changeType() ) { @@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem break; } - tqlayout->addWidget( new TQLabel( type, this ), 1, 0 ); + layout->addWidget( new TQLabel( type, this ), 1, 0 ); } QSync::SyncChange change() const { return mChange; } @@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange() void MultiConflictDialog::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); mWidgetList = new KWidgetList( this ); - tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 ); + layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 ); TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) ); - tqlayout->addWidget( button, 2, 0 ); + layout->addWidget( button, 2, 0 ); button = new TQPushButton( i18n( "Duplicate Items" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); - tqlayout->addWidget( button, 2, 1 ); + layout->addWidget( button, 2, 1 ); button = new TQPushButton( i18n( "Ignore Conflict" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); - tqlayout->addWidget( button, 2, 2 ); + layout->addWidget( button, 2, 2 ); } #include "multiconflictdialog.moc" diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index 64355e56..d981599b 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -38,7 +38,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) : KWidgetListItem( list ), mPlugin( plugin ) { TQString iconName = MemberInfo::pluginIconName( mPlugin.name() ); - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *icon = new TQLabel( this ); icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) ); @@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) font.setBold( true ); name->setFont( font ); - tqlayout->addWidget( icon, 0, 0 ); - tqlayout->addWidget( name, 0, 1 ); - tqlayout->addWidget( description, 1, 1 ); + layout->addWidget( icon, 0, 0 ); + layout->addWidget( name, 0, 1 ); + layout->addWidget( description, 1, 1 ); } PluginPicker::PluginPicker( TQWidget *parent ) : TQWidget( parent ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); mPluginList = new KWidgetList( this ); - tqlayout->addWidget( mPluginList ); + layout->addWidget( mPluginList ); connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ), TQT_SIGNAL( selected() ) ); diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index f9228e17..8975b6f9 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange() void SingleConflictDialog::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this ); - tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); + layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) ); - tqlayout->addWidget( button, 2, 0 ); + layout->addWidget( button, 2, 0 ); button = new TQPushButton( i18n( "Duplicate Items" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); - tqlayout->addWidget( button, 2, 1 ); + layout->addWidget( button, 2, 1 ); button = new TQPushButton( i18n( "Ignore Conflict" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); - tqlayout->addWidget( button, 2, 2 ); + layout->addWidget( button, 2, 2 ); button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) ); - tqlayout->addWidget( button, 2, 3 ); + layout->addWidget( button, 2, 3 ); } #include "singleconflictdialog.moc" diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 8dddd300..4af2bcb1 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -245,7 +245,7 @@ please visit http://webcvs.kde.org 1999-01-23 Stefan Taferner (KMail-1.0.14) - * New feature: tqlayout can now be switched between + * New feature: layout can now be switched between "long folder list" and "short folder list". Option setable in settings->appearance. @@ -264,7 +264,7 @@ please visit http://webcvs.kde.org Now it is possible to have more folders than the screen is high and still select them in the filter dialog. * Filter Dialog: changed folder combo box to (semi) auto - resize. Changed tqlayout of dialog to better display all + resize. Changed layout of dialog to better display all elements. Also enabled vertical resizing of dialog. 1999-01-17 Stefan Taferner (KMail-1.0.12) diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index cdab18ac..d970bbe8 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -316,9 +316,9 @@ with questions... length := Q_UINT16 ; little endian (native?) - value := tqunicode-string-value / ulong-value + value := unicode-string-value / ulong-value - tqunicode-string-value := 0*256QChar ; network-byte-order + unicode-string-value := 0*256QChar ; network-byte-order ulong-value := unsigned_long ; little endian @@ -344,7 +344,7 @@ Currently defined tag values are: StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace() Status 16 l status() - u: tqunicode-string-value; l: ulong-value + u: unicode-string-value; l: ulong-value Proposed new (KDE 3.2 / KMail 1.6) entry format: diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 0782f3d3..2ed80f7b 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -196,7 +196,7 @@ namespace KMail { "jan@simonson.pp.se", 0 }, { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up { "Will Stephenson", 0, 0, 0 }, // added IM status indicator - { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor + { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"), "patrick.vogt@unibas.ch", 0 }, { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"), diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index fd29fa19..b25a1a2a 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -358,9 +358,9 @@ void AccountDialog::makeLocalAccountPage() TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); group->setColumnLayout(0, Qt::Horizontal); - group->tqlayout()->setSpacing( 0 ); - group->tqlayout()->setMargin( 0 ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); + group->layout()->setSpacing( 0 ); + group->layout()->setMargin( 0 ); + TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); groupLayout->setAlignment( TQt::AlignTop ); groupLayout->setSpacing( 6 ); groupLayout->setMargin( 11 ); @@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // TODO (marc/bo): Test this mSieveConfigEditor = new SieveConfigEditor( tabWidget ); - mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() ); + mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged())); diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index caafcb35..5ae16164 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage() void AccountWizard::setupAccountInformationPage() { mAccountInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage ); mRealName = new KLineEdit( mAccountInformationPage ); label->setBuddy( mRealName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mRealName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mRealName, 0, 1 ); label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage ); mEMailAddress = new KLineEdit( mAccountInformationPage ); label->setBuddy( mEMailAddress ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mEMailAddress, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mEMailAddress, 1, 1 ); label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage ); mOrganization = new KLineEdit( mAccountInformationPage ); label->setBuddy( mOrganization ); - tqlayout->addWidget( label, 2, 0 ); - tqlayout->addWidget( mOrganization, 2, 1 ); + layout->addWidget( label, 2, 0 ); + layout->addWidget( mOrganization, 2, 1 ); addPage( mAccountInformationPage, i18n( "Account Information" ) ); } @@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage() void AccountWizard::setupLoginInformationPage() { mLoginInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2, + TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage ); mLoginName = new KLineEdit( mLoginInformationPage ); label->setBuddy( mLoginName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mLoginName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mLoginName, 0, 1 ); label = new TQLabel( i18n( "Password:" ), mLoginInformationPage ); mPassword = new KLineEdit( mLoginInformationPage ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mPassword, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mPassword, 1, 1 ); addPage( mLoginInformationPage, i18n( "Login Information" ) ); } @@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage() void AccountWizard::setupServerInformationPage() { mServerInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); mIncomingLabel = new TQLabel( mServerInformationPage ); @@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage() connect( mChooseLocation, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseLocation() ) ); - tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop ); - tqlayout->addWidget( mIncomingLocationWdg, 0, 1 ); - tqlayout->addWidget( mIncomingServerWdg, 0, 1 ); + layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); + layout->addWidget( mIncomingLocationWdg, 0, 1 ); + layout->addWidget( mIncomingServerWdg, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage ); mOutgoingServer = new KLineEdit( mServerInformationPage ); label->setBuddy( mOutgoingServer ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mOutgoingServer, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mOutgoingServer, 1, 1 ); mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); - tqlayout->addWidget( mOutgoingUseSSL, 2, 1 ); + layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); - tqlayout->addWidget( mLocalDelivery, 3, 0 ); + layout->addWidget( mLocalDelivery, 3, 0 ); connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 533ee379..a63ecae9 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mIntroText = new TQLabel( this ); mIntroText->setText( @@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, "deleting the filter rules created by the wizard to get " "back to the former behavior." ) ); - tqlayout->addWidget( mIntroText ); + layout->addWidget( mIntroText ); mScanProgressText = new TQLabel( this ); mScanProgressText->setText( "" ) ; - tqlayout->addWidget( mScanProgressText ); + layout->addWidget( mScanProgressText ); mToolsList = new KListBox( this ); mToolsList->hide(); mToolsList->setSelectionMode( TQListBox::Multi ); mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); - tqlayout->addWidget( mToolsList ); + layout->addWidget( mToolsList ); connect( mToolsList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); - tqlayout->addWidget( mSelectionHint ); + layout->addWidget( mSelectionHint ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) : ASWizPage( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); + TQVBoxLayout *layout = new TQVBoxLayout( mLayout ); mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this ); TQWhatsThis::add( mMarkRules, i18n( "Mark messages which have been classified as spam as read.") ); - tqlayout->addWidget( mMarkRules); + layout->addWidget( mMarkRules); mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this ); TQWhatsThis::add( mMoveSpamRules, i18n( "The default folder for spam messages is the trash folder, " "but you may change that in the folder view below.") ); - tqlayout->addWidget( mMoveSpamRules ); + layout->addWidget( mMoveSpamRules ); mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForSpamFolder->setFolder( "trash" ); @@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForSpamFolder->setShowOutbox( false ); mFolderReqForSpamFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout ); hLayout1->addSpacing( KDialog::spacingHint() * 3 ); hLayout1->addWidget( mFolderReqForSpamFolder ); @@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, "in the folder view below.

    " "Not all tools support a classification as unsure. If you haven't " "selected a capable tool, you can't select a folder as well.") ); - tqlayout->addWidget( mMoveUnsureRules ); + layout->addWidget( mMoveUnsureRules ); mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForUnsureFolder->setFolder( "inbox" ); @@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForUnsureFolder->setShowOutbox( false ); mFolderReqForUnsureFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout ); hLayout2->addSpacing( KDialog::spacingHint() * 3 ); hLayout2->addWidget( mFolderReqForUnsureFolder ); - tqlayout->addStretch(); + layout->addStretch(); connect( mMarkRules, TQT_SIGNAL(clicked()), this, TQT_SLOT(processSelectionChange(void)) ); @@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange() ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mSummaryText = new TQLabel( this ); - tqlayout->addWidget( mSummaryText ); - tqlayout->addStretch(); + layout->addWidget( mSummaryText ); + layout->addStretch(); } diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 475ddd44..ea21ca01 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt { TQWidget *page = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page ); - tqlayout->addWidget( mLabel ); + layout->addWidget( mLabel ); mListBox = new KListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); mListBox->setSelected( TQMAX( 0, current ), true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 1 ); + layout->addWidget( mListBox, 1 ); TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page ); - tqlayout->addWidget( optionLabel ); + layout->addWidget( optionLabel ); mOptions = new KLineEdit( lastOptions, page ); optionLabel->setBuddy( mOptions ); - tqlayout->addWidget( mOptions ); + layout->addWidget( mOptions ); - tqlayout->addStretch(); + layout->addStretch(); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 538b6205..e569eff3 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -167,7 +167,7 @@ namespace { void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) { g->setTitle( i18n( e.desc ) ); - g->tqlayout()->setSpacing( KDialog::spacingHint() ); + g->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < e.numItems ; ++i ) g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i ); } @@ -597,7 +597,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // label: zero stretch ### FIXME more vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) ); - // hbox tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint @@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * this, TQT_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); - // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * i18n("Common Options"), this ); vlay->addWidget(group); - // a grid tqlayout for the contents of the "common options" group box - glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() ); + // a grid layout for the contents of the "common options" group box + glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() ); glay->setColStretch( 2, 10 ); // "confirm before send" check box: @@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // label: zero stretch vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) ); - // hbox tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing @@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha this, TQT_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); - // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -1123,7 +1123,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); vlay->addWidget( group ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->tqpalette().active().base(), // bg + kapp->palette().active().base(), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->tqpalette().active().text(), // fg + kapp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-tqlayout"); + return TQString::fromLatin1("configure-appearance-layout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "General Options" group: group = new TQVButtonGroup( i18n( "General Options" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group ); @@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Message Header Threading Options" group: mNestingPolicy = new TQVButtonGroup( i18n("Threaded Message List Options"), this ); - mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() ); + mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() ); mNestingPolicy->insert( new TQRadioButton( i18n("Always &keep threads open"), @@ -2053,7 +2053,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); - mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() ); + mDateDisplay->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); @@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); - mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * // The "external editor" group: group = new TQVGroupBox( i18n("External Editor"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), @@ -3185,7 +3185,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" @@ -3214,7 +3214,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::marginHint() ); + group->layout()->setSpacing( KDialog::marginHint() ); // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" @@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "HTML Messages" group box: group = new TQVGroupBox( i18n( "HTML Messages" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); @@ -3822,14 +3822,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // encrypted messages group group = new TQVGroupBox( i18n("Encrypted Messages"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: group = new TQVGroupBox( i18n("Message Disposition Notifications"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "ignore", "ask", "deny", "always send" radiobutton line: @@ -3897,7 +3897,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "Attached keys" group box: group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 93f6123c..9f668ca3 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -195,7 +195,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, bool modal ) : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { - // tqlayout the page (a combobox with label): + // layout the page (a combobox with label): TQWidget *page = makeMainWidget(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); mComboBox = new TQComboBox( false, page ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 73300edd..df92c4f3 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -15,7 +15,7 @@ - tqlayout9 + layout9 @@ -26,7 +26,7 @@ - tqlayout8 + layout8 @@ -147,7 +147,7 @@ - tqlayout8 + layout8 @@ -155,7 +155,7 @@ - tqlayout6 + layout6 @@ -181,7 +181,7 @@ - tqlayout7 + layout7 @@ -222,7 +222,7 @@ - tqlayout4 + layout4 diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h index 0f223178..9fe17306 100644 --- a/kmail/encodingdetector.h +++ b/kmail/encodingdetector.h @@ -35,7 +35,7 @@ class EncodingDetectorPrivate; * Searches for encoding declaration inside raw data -- meta and xml tags. * In the case it can't find it, uses heuristics for specified language. * - * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told + * If it finds unicode BOM marks, it changes encoding regardless of what the user has told * * Intended lifetime of the object: one instance per document. * diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 98c3579c..1faf61a1 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); - TQGridLayout* tqlayout = + TQGridLayout* layout = new TQGridLayout( stuff, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); mInfoLabel = new TQLabel("", stuff ); mRootLabel = new TQLabel("", stuff ); mProgressBar = new TQProgressBar( stuff ); - tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); - tqlayout->addWidget( mRootLabel, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); - //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); - tqlayout->addWidget( mInfoLabel, 1, 1 ); - tqlayout->addWidget( mProgressBar, 2, 1 ); + layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); + layout->addWidget( mRootLabel, 0, 1 ); + layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); + //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); + layout->addWidget( mInfoLabel, 1, 1 ); + layout->addWidget( mProgressBar, 2, 1 ); box->addWidget( stuff ); box->addStretch( 2 ); } diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 68c881f0..4355c9df 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index ab3ae936..1e745517 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -124,7 +124,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -223,7 +223,7 @@ namespace KMail { strategy = HeaderStrategy::rich(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); @@ -427,7 +427,7 @@ namespace KMail { // ### from kmreaderwin begin // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); TQString headerStr = TQString("

    \n").arg(dir); @@ -882,7 +882,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index c2455264..b37a400d 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -427,11 +427,11 @@ namespace KMail { // Tab Widget: Signature // mSignatureConfigurator = new SignatureConfigurator( tabWidget ); - mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") ); mXFaceConfigurator = new XFaceConfigurator( tabWidget ); - mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") ); KConfigGroup geometry( KMKernel::config(), "Geometry" ); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 72a68c65..1ece4c51 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr) TQString result; for (uint i = 0; i < aStr.length(); i++) /* yes, no typo. can't encode ' ' or '!' because - they're the tqunicode BOM. stupid scrambling. stupid. */ - result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + they're the unicode BOM. stupid scrambling. stupid. */ + result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index b2cd4d39..d1889e29 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -561,10 +561,10 @@ true - kapp->tqpalette().active().text() + kapp->palette().active().text() - kapp->tqpalette().active().base() + kapp->palette().active().base() TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower() diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 341a3520..3194b0ca 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget ) KMCommand::Result KMUrlCopyCommand::execute() { - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); if (mUrl.protocol() == "mailto") { // put the url into the mouse selection and the clipboard diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 31fff2ad..7db2c677 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->tqpalette().active().text()); - mBackColor = TQColor(kapp->tqpalette().active().base()); + mForeColor = TQColor(kapp->palette().active().text()); + mBackColor = TQColor(kapp->palette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation() { if( mEditor->hasFocus() && msg() ) { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) mEditor->insert(addQuotesToText(s)); } @@ -3673,13 +3673,13 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); return; } - TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); + TQMimeSource *mimeSource = TQApplication::clipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { slotAttachPNGImageData(mimeSource->encodedData("image/png")); } @@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() KMMessagePart *msgPart = new KMMessagePart; msgPart->setName(attName); TQValueList dummy; - msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy, + msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy, kmkernel->msgSender()->sendQuotedPrintable()); addAttach(msgPart); } @@ -3832,7 +3832,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) TQWidget* fw = focusWidget(); if (!fw) return; - TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); + TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { @@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig() KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); - mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() ); + mKSpellConfig.layout()->setMargin( KDialog::marginHint() ); qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 4b45adc8..99382915 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor c = TQt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos ) enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; TQPopupMenu *menu = KEdit::createPopupMenu( pos ); - if ( !TQApplication::tqclipboard()->image().isNull() ) { + if ( !TQApplication::clipboard()->image().isNull() ) { int id = menu->idAt(0); menu->setItemEnabled( id - IdPaste, true); } diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index d484102a..4ba4422c 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -1140,7 +1140,7 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) // don't show scroll bars. mComboBox->setSizeLimit( mComboBox->count() ); - // tqlayout management: + // layout management: // o the combo box is not to be made larger than it's sizeHint(), // the parameter widget should grow instead. // o the whole widget takes all space horizontally, but is fixed vertically. diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index dead2a98..161354bc 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) +static void addLine( TQWidget *parent, TQVBoxLayout* layout ) { TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); line->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( line ); + layout->addWidget( line ); } //---------------------------------------------------------------------------- @@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, addLine( this, topLayout ); - // use grid tqlayout for the following combobox settings + // use grid layout for the following combobox settings TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() ); gl->setColStretch( 1, 100 ); // make the second column use all available space int row = -1; diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index a0fe190d..63010f9b 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void) setFont(KGlobalSettings::generalFont()); } - // restore the tqlayout + // restore the layout restoreLayout(conf, "Geometry"); } @@ -510,7 +510,7 @@ void KMFolderTree::writeConfig() writeIsListViewItemOpen(fti); } - // save the current tqlayout + // save the current layout saveLayout(KMKernel::config(), "Geometry"); } diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 7b5d2a3c..0b10d3d4 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -429,10 +429,10 @@ void KMHeaders::readColorConfig (void) KConfig* config = KMKernel::config(); // Custom/System colors KConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=KGlobalSettings::alternateBackgroundColor(); @@ -1371,10 +1371,10 @@ void KMHeaders::setStyleDependantFrameWidth() { // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -2676,7 +2676,7 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) - fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); + fwrite(key.unicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); if (update_discover) { //update the discovered change count diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 392f348b..33380686 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -551,7 +551,7 @@ void KMMainWidget::writeConfig(void) //----------------------------------------------------------------------------- void KMMainWidget::createWidgets(void) { - // Create the splitters according to the tqlayout settings + // Create the splitters according to the layout settings TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; @@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void) mTopLayout->add( mPanner1 ); // BUG -sanders these accelerators stop working after switching - // between long/short folder tqlayout + // between long/short folder layout // Probably need to disconnect them first. // create list of messages diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index dbf34b1c..5045b0e6 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -545,7 +545,7 @@ public: */ void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; @@ -746,7 +746,7 @@ public: static TQString guessEmailAddressFromLoginName( const TQString& userName ); /** - * Given argument msg add quoting characters and retqlayout for max width maxLength + * Given argument msg add quoting characters and relayout for max width maxLength * @param msg the string which it to be quoted * @param maxLineLength reformat text to be this amount of columns at maximum, adding * linefeeds at word boundaries to make it fit. diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index e5cead4d..50af4a42 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() { header()->setStretchEnabled( true, 0 ); // rest of the columns: if ( KMKernel::config()->hasGroup( configGroup ) ) { - // there is a saved tqlayout. use it... + // there is a saved layout. use it... restoreLayout( KMKernel::config(), configGroup ); // and disable Maximum mode: for ( int i = 1 ; i < 4 ; ++i ) @@ -213,10 +213,10 @@ void KMMimePartTree::setStyleDependantFrameWidth() { // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -309,7 +309,7 @@ void KMMimePartTree::slotCopy() if ( !url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } //============================================================================= diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 0f7e2890..6a5a1057 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -587,7 +587,7 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.at(i).tqunicode() >= 128) { + if (result.at(i).unicode() >= 128) { result.at(i) = '?'; all_ok = false; } @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.at(i).tqunicode() >= 128) nonAscii++; + if (_str.at(i).unicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -815,7 +815,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, { if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) start = p + 1; - if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32) + if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32) break; p++; } @@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str) { uint len = str.length(); str = TQDeepCopy(str); - TQChar *tqunicode = const_cast( str.tqunicode() ); + TQChar *unicode = const_cast( str.unicode() ); for (uint i = 0; i < len; i++) - tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode()); + unicode[i] = kmail_swap_16(unicode[i].unicode()); } //----------------------------------------------------------------------------- @@ -1371,23 +1371,23 @@ const uchar *KMMsgBase::asIndexString(int &length) const //these is at the beginning because it is queried quite often tmp_str = msgIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = mLegacyStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order tmp_str = fromStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = subject().stripWhiteSpace(); - STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = toStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = replyToIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = xmark().stripWhiteSpace(); - STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = fileName().stripWhiteSpace(); - STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = msgSize(); STORE_DATA(MsgSizePart, tmp); tmp = folderOffset(); @@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgMDNSentPart, tmp); tmp_str = replyToAuxIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = strippedSubjectMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = status(); STORE_DATA(MsgStatusPart, tmp); @@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgUIDPart, tmp); tmp_str = from(); - STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true ); tmp_str = to(); - STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true ); return ret; } diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index a135edc5..1137bb6e 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -459,7 +459,7 @@ public: enum MsgPartType { MsgNoPart = 0, - //tqunicode strings + //unicode strings MsgFromStripPart = 1, MsgSubjectPart = 2, MsgToStripPart = 3, @@ -474,7 +474,7 @@ public: MsgFilePart = 11, MsgCryptoStatePart = 12, MsgMDNSentPart = 13, - //another two tqunicode strings + //another two unicode strings MsgReplyToAuxIdMD5Part = 14, MsgStrippedSubjectMD5Part = 15, // and another unsigned long diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index e4c41a40..9d69f87c 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -58,7 +58,7 @@ public: **/ void setBodyFromUnicode( const TQString & str ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 6e310641..e7cfe858 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1999,10 +1999,10 @@ void KMReaderWin::setStyleDependantFrameWidth() return; // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != mBox->lineWidth() ) @@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice ) if (!url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } else if ( choice == 10 ) { // Scroll To scrollToAttachment( node ); } @@ -2880,7 +2880,7 @@ void KMReaderWin::injectAttachments() imgSrc.append( "attachmentQuicklistOpened.png" ); } - TQString html = renderAttachments( mRootNode, TQApplication::tqpalette().active().background() ); + TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); if ( html.isEmpty() ) return; diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index d3188926..baa63731 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -370,7 +370,7 @@ public slots: /** Refresh the reader window */ void updateReaderWin(); - /** HTML Widget scrollbar and tqlayout handling. */ + /** HTML Widget scrollbar and layout handling. */ void slotScrollUp(); void slotScrollDown(); void slotScrollPrior(); diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 2e85c38d..b60ada92 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQLabel* label; mLastItem = 0; - TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(), + TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(), "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); mlGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() ); + TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 6b6b6819..8d87d2d4 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - parentWidget()->tqlayout()->activate(); + parentWidget()->layout()->activate(); emit sizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index e2955167..1239e65d 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -52,7 +52,7 @@ namespace KMail { TQVBoxLayout * vlay; TQVBoxLayout * page_vlay; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); // "enable signatue" checkbox: mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this ); diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index a1a34d39..430cbe7f 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -54,7 +54,7 @@ - tqlayout4 + layout4 @@ -80,7 +80,7 @@ - tqlayout5 + layout5 @@ -202,7 +202,7 @@ - tqlayout5 + layout5 @@ -312,7 +312,7 @@ - tqlayout5 + layout5 diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 4197fa19..d2b5c19d 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam connect( snippetName, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()) ); - tqlayout3->addWidget( textLabel3, 7, 0 ); - tqlayout3->addWidget( keyButton, 7, 1 ); + layout3->addWidget( textLabel3, 7, 0 ); + layout3->addWidget( keyButton, 7, 1 ); // tab order setTabOrder( snippetText, keyButton ); diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index f49212ad..3f05f08f 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -64,7 +64,7 @@ - tqlayout3 + layout3 diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 83eba964..c266a202 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -123,7 +123,7 @@ - tqlayout1 + layout1 diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 2c81c6d2..0b4f271a 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -660,7 +660,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMap * map, TQMapsizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -705,7 +705,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -718,7 +718,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapsizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -767,7 +767,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapaddWidget(labTop, 0, 0); labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -820,7 +820,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); layoutBtn->addWidget( btn1, 0, 0 ); @@ -829,7 +829,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapsetDefault( TRUE ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -861,7 +861,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap - tqlayout5 + layout5 diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index f16a157b..cef88e25 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days. - tqlayout1 + layout1 diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index d329ef36..64b165ef 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -84,7 +84,7 @@ namespace KMail { TQPushButton * mFromFileBtn; TQPushButton * mFromAddrbkBtn; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); hlay = new TQHBoxLayout( vlay ); // "enable X-Face" checkbox: diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 9d6b219a..2174c681 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -167,7 +167,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict &dict ) { /* Each sylpheed mail directory contains a .sylpheed_mark file which - * contains all the flags for each messages. The tqlayout of this file + * contains all the flags for each messages. The layout of this file * is documented in the source code of sylpheed: in procmsg.h for * the flag bits, and procmsg.c. * diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index 475b6ff1..0a1e7da4 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -69,7 +69,7 @@ - tqlayout16 + layout16 @@ -77,7 +77,7 @@ - tqlayout90 + layout90 diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index 84ed15ce..f8237504 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -69,7 +69,7 @@ - tqlayout19 + layout19 diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 2ad24ec4..67b41b14 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index 2bb90744..6b5a0230 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -27,8 +27,8 @@ KMobilePreferences::KMobilePreferences() KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -36,8 +36,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 2827d025..0f8291cf 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -1408,8 +1408,8 @@ void ArticleWidget::slotCopyURL() address = mCurrentURL.path(); else address = mCurrentURL.url(); - TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( address, TQClipboard::Selection ); + TQApplication::clipboard()->setText( address, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( address, TQClipboard::Selection ); } void ArticleWidget::slotAddBookmark() diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 7b73cc7b..e1fb2069 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -93,7 +93,7 @@ void KNCollectionView::readConfig() KConfig *conf = knGlobals.config(); conf->setGroup( "GroupView" ); - // execute the listview tqlayout stuff only once + // execute the listview layout stuff only once static bool initDone = false; if (!initDone) { initDone = true; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index c2523d13..d03a653c 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -1782,9 +1782,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) KConfig *config = knGlobals.config(); KConfigGroupSaver saver(config, "VISUAL_APPEARANCE"); TQColor defaultColor1( kapp->tqpalette().active().text()); // defaults from kmreaderwin.cpp - TQColor defaultColor2( kapp->tqpalette().active().text() ); - TQColor defaultColor3( kapp->tqpalette().active().text() ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultColor2( kapp->palette().active().text() ); + TQColor defaultColor3( kapp->palette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground ); TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 ); TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 ); @@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText() void KNComposer::Editor::slotPasteAsQuotation() { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) { for (int i=0; (uint)itqpalette().active().base(); + return kapp->palette().active().base(); case alternateBackground: return KGlobalSettings::alternateBackgroundColor(); @@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const case normalText: case unreadThread: - return kapp->tqpalette().active().text(); + return kapp->palette().active().text(); case url: return KGlobalSettings::linkColor(); case readThread: - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); case unreadArticle: return TQColor( 183, 154, 11 ); @@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return TQColor( 0xFF, 0x40, 0x40 ); } - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); } diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index aa93af98..b34d7638 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); mExpGroup->setColumnLayout(0, Qt::Vertical ); - mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mExpGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mExpGroup->layout()->setSpacing( KDialog::spacingHint() ); + mExpGroup->layout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); - TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 ); + TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 ); grid->setRowSpacing( 0, KDialog::spacingHint() ); @@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); foldersB->setColumnLayout(0, Qt::Vertical ); - foldersB->tqlayout()->setSpacing( KDialog::spacingHint() ); - foldersB->tqlayout()->setMargin( KDialog::marginHint() ); + foldersB->layout()->setSpacing( KDialog::spacingHint() ); + foldersB->layout()->setMargin( KDialog::marginHint() ); topL->addWidget(foldersB); - TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2); + TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2); foldersL->setRowSpacing( 0, KDialog::spacingHint() ); diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index 3aa9677b..be91593a 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); - //tqlayout + //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); TQHBoxLayout *filterL=new TQHBoxLayout(10); TQVBoxLayout *arrL=new TQVBoxLayout(10); diff --git a/knotes/ChangeLog b/knotes/ChangeLog index 95990a9d..532a9279 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -616,7 +616,7 @@ ChangeLog for KNotes 2001/06/23 Michael Brade * fixed #18086 (add a size grip for the notes) - * update the title tqlayout if the font was changed + * update the title layout if the font was changed 2001/06/17 Michael Brade @@ -863,7 +863,7 @@ Tue Aug 3 02:23:09 1999 Carsten Pfeiffer * added possibility to play a sound when an alarm is activated, configurable in the defaults dialog * replaced the custom spinboxes with QSpinBoxes and made the dialog use - tqlayout management (still not perfect, yet) + layout management (still not perfect, yet) 1999-06-07 Petter Reinholdtsen * knotes.cpp: Changed text Quit to Exit to match KDE style guide. diff --git a/knotes/knote.cpp b/knotes/knote.cpp index e22ab428..2b0ae959 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -1020,7 +1020,7 @@ void KNote::createFold() TQPixmap fold( 15, 15 ); TQPainter foldp( &fold ); foldp.setPen( TQt::NoPen ); - foldp.setBrush( tqpalette().active().dark() ); + foldp.setBrush( palette().active().dark() ); TQPointArray foldpoints( 3 ); foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 ); foldp.drawPolygon( foldpoints ); @@ -1042,7 +1042,7 @@ void KNote::updateFocus() { if ( hasFocus() ) { - m_label->setBackgroundColor( tqpalette().active().shadow() ); + m_label->setBackgroundColor( palette().active().shadow() ); m_button->show(); if ( !m_editor->isReadOnly() ) @@ -1081,11 +1081,11 @@ void KNote::updateFocus() if ( s_ppOffset ) { - m_label->setBackgroundColor( tqpalette().active().midlight() ); + m_label->setBackgroundColor( palette().active().midlight() ); m_fold->show(); } else - m_label->setBackgroundColor( tqpalette().active().background() ); + m_label->setBackgroundColor( palette().active().background() ); } } @@ -1138,7 +1138,7 @@ void KNote::updateBackground( int y_offset ) TQImage grad_img( w, h, 32 ); TQRgb rgbcol; - TQColor bg = tqpalette().active().background(); + TQColor bg = palette().active().background(); for ( int i = 0; i < h; ++i ) { @@ -1172,7 +1172,7 @@ void KNote::updateLayout() if ( s_ppOffset ) { if ( !m_editor->paper().pixmap() ) // just changed the style - setColor( tqpalette().active().foreground(), tqpalette().active().background() ); + setColor( palette().active().foreground(), palette().active().background() ); m_pushpin->show(); setFrameStyle( Panel | Raised ); @@ -1185,7 +1185,7 @@ void KNote::updateLayout() else { if ( m_editor->paper().pixmap() ) // just changed the style - setColor( tqpalette().active().foreground(), tqpalette().active().background() ); + setColor( palette().active().foreground(), palette().active().background() ); setFrameStyle( WinPanel | Raised ); m_pushpin->hide(); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index be141088..0c7862b2 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p ) if ( !m_flat ) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); + style().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); drawButtonLabel( p ); } @@ -102,8 +102,8 @@ void KNoteButton::drawButtonLabel( TQPainter* p ) // Shift button contents if pushed. if ( isOn() || isDown() ) { - dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } p->drawPixmap( dx, dy, pix ); diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 2e26ab99..9eeb3fdc 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption() TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) { TQWidget *displayPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2, + TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" ); - tqlayout->addWidget( label_FgColor, 0, 0 ); + layout->addWidget( label_FgColor, 0, 0 ); KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" ); label_FgColor->setBuddy( kcfg_FgColor ); - tqlayout->addWidget( kcfg_FgColor, 0, 1 ); + layout->addWidget( kcfg_FgColor, 0, 1 ); TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" ); - tqlayout->addWidget( label_BgColor, 1, 0 ); + layout->addWidget( label_BgColor, 1, 0 ); KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" ); label_BgColor->setBuddy( kcfg_BgColor ); - tqlayout->addWidget( kcfg_BgColor, 1, 1 ); + layout->addWidget( kcfg_BgColor, 1, 1 ); TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"), displayPage, "kcfg_ShowInTaskbar" ); @@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) if ( defaults ) { TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" ); - tqlayout->addWidget( label_Width, 2, 0 ); + layout->addWidget( label_Width, 2, 0 ); KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" ); label_Width->setBuddy( kcfg_Width ); kcfg_Width->setRange( 50, 2000, 10, false ); - tqlayout->addWidget( kcfg_Width, 2, 1 ); + layout->addWidget( kcfg_Width, 2, 1 ); TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" ); - tqlayout->addWidget( label_Height, 3, 0 ); + layout->addWidget( label_Height, 3, 0 ); KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" ); kcfg_Height->setRange( 50, 2000, 10, false ); label_Height->setBuddy( kcfg_Height ); - tqlayout->addWidget( kcfg_Height, 3, 1 ); + layout->addWidget( kcfg_Height, 3, 1 ); - tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); + layout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); } else - tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); + layout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); return displayPage; } @@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) { TQWidget *editorPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3, + TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" ); - tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); + layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" ); kcfg_TabSize->setRange( 0, 40, 1, false ); label_TabSize->setBuddy( kcfg_TabSize ); - tqlayout->addWidget( kcfg_TabSize, 0, 2 ); + layout->addWidget( kcfg_TabSize, 0, 2 ); TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" ); - tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); + layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" ); - tqlayout->addWidget( kcfg_RichText, 1, 2 ); + layout->addWidget( kcfg_RichText, 1, 2 ); TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" ); - tqlayout->addWidget( label_Font, 3, 0 ); + layout->addWidget( label_Font, 3, 0 ); KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); + layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); - tqlayout->addWidget( label_TitleFont, 2, 0 ); + layout->addWidget( label_TitleFont, 2, 0 ); KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); + layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); return editorPage; } @@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage() TQWidget *KNoteConfigDlg::makeActionsPage() { TQWidget *actionsPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" ); - tqlayout->addWidget( label_MailAction, 0, 0 ); + layout->addWidget( label_MailAction, 0, 0 ); KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" ); label_MailAction->setBuddy( kcfg_MailAction ); - tqlayout->addWidget( kcfg_MailAction, 0, 1 ); + layout->addWidget( kcfg_MailAction, 0, 1 ); return actionsPage; } @@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage() TQWidget *KNoteConfigDlg::makeNetworkPage() { TQWidget *networkPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage ); - tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); + layout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" ); TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage ); - tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); + layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" ); KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" ); label_SenderID->setBuddy( kcfg_SenderID ); TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" ); - tqlayout->addWidget( label_Port, 2, 0 ); + layout->addWidget( label_Port, 2, 0 ); KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" ); kcfg_Port->setRange( 0, 65535, 1, false ); label_Port->setBuddy( kcfg_Port ); - tqlayout->addWidget( kcfg_Port, 2, 1 ); + layout->addWidget( kcfg_Port, 2, 1 ); return networkPage; } @@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage() TQWidget *KNoteConfigDlg::makeStylePage() { TQWidget *stylePage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" ); - tqlayout->addWidget( label_Style, 0, 0 ); + layout->addWidget( label_Style, 0, 0 ); TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" ); TQStringList list; list << "Plain" << "Fancy"; kcfg_Style->insertStringList( list ); label_Style->setBuddy( kcfg_Style ); - tqlayout->addWidget( kcfg_Style, 0, 1 ); + layout->addWidget( kcfg_Style, 0, 1 ); return stylePage; } diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index b76f1984..e62c3f45 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -266,7 +266,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) TQString KNotesApp::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::tqclipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 42ff66fc..998439de 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -62,7 +62,7 @@ void KNotesNetworkSender::setSenderId( const TQString& sender ) void KNotesNetworkSender::setNote( const TQString& title, const TQString& text ) { - // TODO: support for tqunicode and rich text. + // TODO: support for unicode and rich text. // Mmmmmm... how to behave with such heterogeneous environment? // AFAIK, ATnotes does not allow UNICODE. m_title = title.ascii(); diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 207730a1..417f81a0 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -32,15 +32,15 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) : KRES::ConfigWidget( parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); TQLabel *label = new TQLabel( i18n( "Location:" ), this ); mURL = new KURLRequester( this ); KFile::Mode mode = static_cast( KFile::File | KFile::LocalOnly ); mURL->setMode( mode ); - tqlayout->addWidget( label ); - tqlayout->addWidget( mURL ); + layout->addWidget( label ); + layout->addWidget( mURL ); } ResourceLocalConfig::~ResourceLocalConfig() diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index bfcd375e..7466029c 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, TQt::Horizontal ); - TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); + TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), inputWidget ); - tqlayout->addWidget( label, row, 0 ); - tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); + layout->addWidget( label, row, 0 ); + layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); } return inputWidget; diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 7a5eeb71..6bc1d824 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS : TQWidget( parent ), mParentField( parentField ), mName( name ), mType( type ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); mView = new TQListBox( this ); - tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 ); + layout->addMultiCellWidget( mView, 0, 3, 0, 0 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - tqlayout->addWidget( mAddButton, 0, 1 ); + layout->addWidget( mAddButton, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit..." ), this ); - tqlayout->addWidget( mEditButton, 1, 1 ); + layout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - tqlayout->addWidget( mRemoveButton, 2, 1 ); + layout->addWidget( mRemoveButton, 2, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index c5ea0016..96a758c3 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -88,18 +88,18 @@ TQString PageInputField::data() const TQWidget *PageInputField::createWidget( TQWidget *parent ) { TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); - TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); label->setAlignment( TQt::AlignTop ); - tqlayout->addWidget( label, row, 0 ); - tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); + layout->addWidget( label, row, 0 ); + layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } - tqlayout->setRowStretch( ++row, 1 ); + layout->setRowStretch( ++row, 1 ); return mInputWidget; } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 16146f2c..7409fcd1 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -75,7 +75,7 @@ void KCMKMailSummary::modified() void KCMKMailSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFolderView = new KListView( this ); mFolderView->setRootIsDecorated( true ); @@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI() mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this ); - tqlayout->addWidget( mFolderView ); - tqlayout->addWidget( mFullPath ); + layout->addWidget( mFolderView ); + layout->addWidget( mFullPath ); } void KCMKMailSummary::initFolders() diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index db6e43b6..a66aa4c1 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) TQString KNotesPart::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::tqclipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 274d140e..3794638e 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -130,9 +130,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient actionCollection()->setWidget( this ); TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); - TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() ); + TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() ); TQLabel *label = new TQLabel( page); label->setText( i18n( "Name:" ) ); hbl->addWidget( label,0 ); @@ -149,8 +149,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient mTool = static_cast(factory.container( "note_tool", this )); - tqlayout->addWidget( mTool ); - tqlayout->addWidget( mNoteEdit ); + layout->addWidget( mTool ); + layout->addWidget( mNoteEdit ); } TQString text() const diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 79a45d21..ec77cc50 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent ) mPreview->setHScrollBarMode( TQScrollView::AlwaysOff ); mPreview->setVScrollBarMode( TQScrollView::AlwaysOff ); - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( mPreview ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( mPreview ); setPalette( TQToolTip::palette() ); setMargin( 1 ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 4466c5c6..170e3195 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value ) void KCMKOrgSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup ); @@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addWidget( mCalendarGroup ); + layout->addWidget( mCalendarGroup ); mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this ); new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); - tqlayout->addWidget( mTodoGroup ); + layout->addWidget( mTodoGroup ); - tqlayout->addStretch(); + layout->addStretch(); } void KCMKOrgSummary::load() diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index fe2a20c6..50aa975f 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi Ok, parent, 0, true, true ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(), + TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new TQLineEdit( page ); label->setBuddy( mTitle ); - tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); label = new TQLabel( i18n( "URL:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mURL = new TQLineEdit( page ); label->setBuddy( mURL ); - tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); mTitle->setText( title ); mURL->setText( url ); @@ -331,16 +331,16 @@ void KCMKontactKNT::modified() void KCMKontactKNT::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mAllNews = new KListView( this ); mAllNews->addColumn( i18n( "All" ) ); mAllNews->setRootIsDecorated( true ); mAllNews->setFullWidth( true ); - tqlayout->addWidget( mAllNews, 0, 0 ); + layout->addWidget( mAllNews, 0, 0 ); - TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() ); vbox->addStretch(); mAddButton = new KPushButton( i18n( "Add" ), this ); @@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI() mSelectedNews = new KListView( this ); mSelectedNews->addColumn( i18n( "Selected" ) ); mSelectedNews->setFullWidth( true ); - tqlayout->addWidget( mSelectedNews, 0, 2 ); + layout->addWidget( mSelectedNews, 0, 2 ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, i18n( "News Feed Settings" ), this ); - TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3, + TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box ); @@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI() mDeleteButton->setEnabled( false ); boxLayout->addWidget( mDeleteButton, 1, 2 ); - tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 ); + layout->addMultiCellWidget( box, 1, 1, 0, 2 ); } bool KCMKontactKNT::dcopActive() const diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 3c58e0dd..ecd70a1e 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->tqclipboard()->setText( url, TQClipboard::Clipboard ); + kapp->clipboard()->setText( url, TQClipboard::Clipboard ); } bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index a5940659..7d7cae93 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value ) void KCMSDSummary::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup ); @@ -117,7 +117,7 @@ void KCMSDSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this ); @@ -132,10 +132,10 @@ void KCMSDSummary::initGUI() mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); - tqlayout->addWidget( mCalendarGroup, 1, 0 ); - tqlayout->addWidget( mContactGroup, 1, 1 ); + layout->addWidget( mCalendarGroup, 1, 0 ); + layout->addWidget( mContactGroup, 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void KCMSDSummary::load() diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index bf0197cb..f85feda2 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -93,15 +93,15 @@ PluginView::~PluginView() KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPluginView = new PluginView( this ); - tqlayout->addWidget( mPluginView ); + layout->addWidget( mPluginView ); - tqlayout->setStretchFactor( mPluginView, 1 ); + layout->setStretchFactor( mPluginView, 1 ); connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 97bb4c53..01c5a7f1 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets() TQFrame *vline = new TQFrame( mFrame ); vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain ); - TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame ); + TQHBoxLayout *layout = new TQHBoxLayout( mFrame ); - mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - tqlayout->addWidget( vline ); - mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); + layout->addWidget( vline ); + mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); TQStringList::Iterator strIt; @@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() ); + mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bf7624e4..fb8bd951 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -106,8 +106,8 @@ void SummaryWidget::updateView() TQImage img; img = (*it).icon(); - TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 ); - mLayouts.append( tqlayout ); + TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 ); + mLayouts.append( layout ); KURLLabel* urlLabel = new KURLLabel( this ); urlLabel->installEventFilter( this ); @@ -115,7 +115,7 @@ void SummaryWidget::updateView() urlLabel->setPixmap( img.smoothScale( 32, 32 ) ); urlLabel->setMaximumSize( urlLabel->sizeHint() ); urlLabel->setAlignment( AlignTop ); - tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); + layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), this, TQT_SLOT( showReport( const TQString& ) ) ); @@ -126,7 +126,7 @@ void SummaryWidget::updateView() font.setBold( true ); label->setFont( font ); label->setAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); + layout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); TQString labelText; @@ -144,7 +144,7 @@ void SummaryWidget::updateView() label = new TQLabel( cover, this ); label->setAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 ); + layout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 91abb28a..a6490766 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -223,7 +223,7 @@ void EntryItem::paint( TQPainter *p ) } if ( plugin()->disabled() ) { - p->setPen( box->tqpalette().disabled().text( ) ); + p->setPen( box->palette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 84af159b..ab725b4c 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); #ifndef KORG_NOSPLITTER - // create the main tqlayout frames. + // create the main layout frames. mPanner = new TQSplitter( Qt::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); @@ -277,7 +277,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) KOGlobals::self()-> setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) ); - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( checkClipboard() ) ); connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), @@ -1934,7 +1934,7 @@ void CalendarView::processIncidenceSelection( Incidence *incidence, const TQDate void CalendarView::checkClipboard() { #ifndef KORG_NODND - if (ICalDrag::canDecode(TQApplication::tqclipboard()->data())) { + if (ICalDrag::canDecode(TQApplication::clipboard()->data())) { kdDebug(5850) << "CalendarView::checkClipboard() true" << endl; emit pasteEnabled(true); } else { diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index bfab5207..a5c3f792 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -50,7 +50,7 @@ - tqlayout3 + layout3 @@ -95,7 +95,7 @@ - tqlayout1 + layout1 diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 346bb9d8..6c1c7952 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) xpos = pt.x() + int( subCellPos ); ypos = pt.y(); } - if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout + if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout xpos += width; width = -width; } - if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!? + if ( height<0 ) { // BTT (bottom-to-top) layout ?!? ypos += height; height = -height; } diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 751c9659..f11ea8c0 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -746,7 +746,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) } TQPainter p( this ); - const int ft = 2; // frame thickness for tqlayout, see paintFrame() + const int ft = 2; // frame thickness for layout, see paintFrame() const int margin = 1 + ft; // frame + space between frame and content // General idea is to always show the icons (even in the all-day events). diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index e48796c7..5b46fedb 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode ) } // HACK: Update the view if the all-day agenda has been modified. - // Do this because there are some tqlayout problems in the + // Do this because there are some layout problems in the // all-day agenda that are not easily solved, but clearing // and redrawing works ok. if ( incidence->doesFloat() ) { diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 36037ea9..b0cdc295 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) : { } -void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout) { mOrganizerHBox = new TQHBox( parent ); - tqlayout->addWidget( mOrganizerHBox ); + layout->addWidget( mOrganizerHBox ); // If creating a new event, then the user is the organizer -> show the // identity combo // readEvent will delete it and set another label text instead, if the user @@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 ); } -void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) { TQGridLayout *topLayout = new TQGridLayout(); - tqlayout->addLayout( topLayout ); + layout->addLayout( topLayout ); TQString whatsThis = i18n("Edits the name of the attendee selected in the list " "above, or adds a new attendee if there are no attendees" diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 828bf479..0719744b 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -68,8 +68,8 @@ class KOAttendeeEditor : public TQWidget void updateAttendeeSummary( int count ); protected: - void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); - void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); + void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout ); + void initEditWidgets( TQWidget *parent, TQBoxLayout *layout ); /** Reads values from a KABC::Addressee and inserts a new Attendee * item into the listview with those items. Used when adding attendees diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 431b4b3d..1ced5338 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -562,7 +562,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * ) int selw, selh; bool isRTL = KOGlobals::self()->reverseLayout(); - TQColorGroup cg = tqpalette().active(); + TQColorGroup cg = palette().active(); p.begin( &pm, this ); pm.fill( cg.base() ); diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index cc062528..716252f2 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 @@ -109,7 +109,7 @@ - tqlayout8 + layout8 @@ -530,7 +530,7 @@ - tqlayout7 + layout7 diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index ed358947..ec23e9ee 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i ) void KOEditorAttachments::slotCopy() { - TQApplication::tqclipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard ); } void KOEditorAttachments::slotCut() @@ -885,7 +885,7 @@ void KOEditorAttachments::slotCut() void KOEditorAttachments::slotPaste() { - handlePasteOrDrop( TQApplication::tqclipboard()->data() ); + handlePasteOrDrop( TQApplication::clipboard()->data() ); } void KOEditorAttachments::selectionChanged() diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index cec2e721..a5dd834f 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) freeTimeLabel->setBuddy( mFreeTimeCombo ); } -void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout) +void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout) { - TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *topLayout = new TQHBoxLayout( layout ); mInvitationBar = new TQFrame( parent ); mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar ); - barLayout->setSpacing( tqlayout->spacing() ); + barLayout->setSpacing( layout->spacing() ); TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar ); barLayout->addWidget( label ); barLayout->addStretch( 1 ); diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 734826eb..037b2323 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -49,7 +49,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral void initTime(TQWidget *,TQBoxLayout *); void initClass(TQWidget *,TQBoxLayout *); - void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout ); + void initInvitationBar( TQWidget* parent, TQBoxLayout *layout ); void finishSetup(); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index c2e108a8..4b5889a8 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name return combo; } -TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, +TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout, TQString everyText, TQString unitText ) { - TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *freqLayout = new TQHBoxLayout( layout ); TQString whatsThis = i18n("Sets how often this event or to-do should recur."); TQLabel *preLabel = new TQLabel( everyText, parent ); diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 1592f427..f3aeeb41 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -61,7 +61,7 @@ class RecurBase : public TQWidget static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 ); - TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, + TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout, TQString everyText, TQString unitText ); private: diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 76bd7c6c..24cf9bbf 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th - tqlayout8 + layout8 @@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb" - tqlayout13 + layout13 diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index f6b12b59..fb333674 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -502,6 +502,6 @@ void KOListView::clear() TQSize KOListView::sizeHint() const { const TQSize s = KOEventView::sizeHint(); - return TQSize( s.width() + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, + return TQSize( s.width() + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, s.height() ); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 5c9edbca..6bb94f5c 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -835,7 +835,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek ); // create the day of the week labels (Sun, Mon, etc) and add them to - // the tqlayout. + // the layout. mDayLabels.resize( mDaysPerWeek ); int i; for( i = 0; i < mDaysPerWeek; i++ ) { diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 322daf92..f14176fb 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -107,7 +107,7 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) mYear->setMinimumHeight( mPrevYear->sizeHint().height() ); TQToolTip::add( mYear, i18n( "Select a year" ) ); - // set up control frame tqlayout + // set up control frame layout TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this ); ctrlLayout->addWidget( mPrevYear ); ctrlLayout->addWidget( mPrevMonth ); diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index e5fc832c..6868729b 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -65,7 +65,7 @@ - tqlayout2 + layout2 diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index ecd2a848..249531df 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -40,7 +40,7 @@ - tqlayout2 + layout2 diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index b8ad273f..a3d4fb69 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -40,7 +40,7 @@ - tqlayout2 + layout2 diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 22d6a065..99d57395 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase() TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) { TQFrame *wdg = new TQFrame( w ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg ); + TQVBoxLayout *layout = new TQVBoxLayout( wdg ); TQLabel *title = new TQLabel( description(), wdg ); TQFont titleFont( title->font() ); @@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) titleFont.setBold( true ); title->setFont( titleFont ); - tqlayout->addWidget( title ); - tqlayout->addWidget( new TQLabel( info(), wdg ) ); - tqlayout->addSpacing( 20 ); - tqlayout->addWidget( new TQLabel( i18n("This printing style does not " + layout->addWidget( title ); + layout->addWidget( new TQLabel( info(), wdg ) ); + layout->addSpacing( 20 ); + layout->addWidget( new TQLabel( i18n("This printing style does not " "have any configuration options."), wdg ) ); - tqlayout->addStretch(); + layout->addStretch(); return wdg; } diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index ed2cf4b9..106ffd7d 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -86,7 +86,7 @@ - tqlayout2 + layout2 diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index 505f4f14..0be844ab 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -246,7 +246,7 @@ Print as &timetable view - This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check <i>Use Colors</i>. + This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>. @@ -257,7 +257,7 @@ Print as split week view - This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait. + This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait. diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index e278d5fb..6d315c50 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mCalendar = calendar; TQFrame *topFrame = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint()); // Search expression TQHBoxLayout *subLayout = new TQHBoxLayout(); - tqlayout->addLayout(subLayout); + layout->addLayout(subLayout); searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame ); @@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); - tqlayout->addWidget( itemsGroup ); + layout->addWidget( itemsGroup ); mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup ); mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup ); mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup ); @@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Date range TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ), topFrame ); - tqlayout->addWidget( rangeGroup ); + layout->addWidget( rangeGroup ); TQWidget *rangeWidget = new TQWidget( rangeGroup ); TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() ); @@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Subjects to search TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame ); - tqlayout->addWidget(subjectGroup); + layout->addWidget(subjectGroup); mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup ); mSummaryCheck->setChecked( true ); @@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Results list view listView = new KOListView( mCalendar, topFrame ); listView->showDates(); - tqlayout->addWidget( listView ); + layout->addWidget( listView ); if ( KOPrefs::instance()->mCompactDialogs ) { KOGlobals::fitDialogToScreen( this, true ); diff --git a/korn/ChangeLog b/korn/ChangeLog index e644587e..d22d617a 100644 --- a/korn/ChangeLog +++ b/korn/ChangeLog @@ -14,7 +14,7 @@ * Converted C-style casts to C++-style, and checked retvals of dynamic_casts. Currently only assert() used, but that's better than crashing. - * Fixed tqlayout of polldlg. + * Fixed layout of polldlg. * Split 'General' cfg widget into two, 'View' and 'Commands' * Added some keyboard accelerators. * Still need to connect config stuff up properly... @@ -28,7 +28,7 @@ * temporarily take care of korn (with Taj's blessing) * fix most of the layouts (/me being too stupid to fix Taj's nice - custom tqlayout classes, I switched completely to pure QLayouts) + custom layout classes, I switched completely to pure QLayouts) * fixed most of the i18n * made FileDialogs start with the current path by default (instead no path, used before) diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 7a0c4637..b026e95c 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu { KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); - TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName ) + TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName ) .arg( total ), "", TQPixmap(), 0 ); - TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" ); + TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" ); - TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" ); + TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" ); TQFont font = title->font(); font.setBold( true ); title->setFont( font ); - title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" ); + title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); if( date ) { - title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" ); + title = new TQLabel( i18n("Date"), mainglayout, "date_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); @@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu for( KornMailSubject* subject = list->first(); subject; subject = list->next() ) { - new TQLabel( subject->getSender(), maingtqlayout, "from-value" ); - new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" ); + new TQLabel( subject->getSender(), mainglayout, "from-value" ); + new TQLabel( subject->getSubject(), mainglayout, "subject-value" ); if( date ) { TQDateTime tijd; tijd.setTime_t( subject->getDate() ); - new TQLabel( tijd.toString(), maingtqlayout, "date-value" ); + new TQLabel( tijd.toString(), mainglayout, "date-value" ); } } popup->setAutoDelete( true ); //Now, now care for deleting these pointers. - popup->setView( mainvtqlayout ); + popup->setView( mainvlayout ); popup->show(); //Display it } diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 9a640718..5e540b4b 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -73,7 +73,7 @@ - tqlayout35 + layout35 @@ -137,7 +137,7 @@ - tqlayout33 + layout33 diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index ce1c9058..19c0bb1d 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _urlfields( 0 ), _boxnr( 0 ), _accountnr( 0 ), - _vtqlayout( 0 ), + _vlayout( 0 ), _protocolLayout( 0 ), _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) @@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) _accountinput->clear(); delete _groupBoxes; delete _protocolLayout; - delete _vtqlayout; - _vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); - _vtqlayout->setSpacing( 10 ); - _vtqlayout->setMargin( 10 ); + delete _vlayout; + _vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); + _vlayout->setSpacing( 10 ); + _vlayout->setMargin( 10 ); - _protocolLayout = new TQHBoxLayout( _vtqlayout ); + _protocolLayout = new TQHBoxLayout( _vlayout ); _protocolLayout->addWidget( this->lbProtocol ); _protocolLayout->addWidget( this->cbProtocol ); @@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it ) { _groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) ); - _vtqlayout->addWidget( _groupBoxes->at( counter ) ); + _vlayout->addWidget( _groupBoxes->at( counter ) ); ++counter; } delete groupBoxes; diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index 10c1cbf7..c17885d6 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -60,7 +60,7 @@ private: int _urlfields; int _boxnr, _accountnr; - TQVBoxLayout *_vtqlayout; + TQVBoxLayout *_vlayout; TQHBoxLayout *_protocolLayout; TQPtrVector< TQWidget > *_groupBoxes; diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 78bd0367..f47b0f3e 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -33,7 +33,7 @@ - tqlayout32 + layout32 @@ -69,7 +69,7 @@ - tqlayout34 + layout34 @@ -124,7 +124,7 @@ - tqlayout33 + layout33 @@ -167,7 +167,7 @@ - tqlayout36 + layout36 @@ -215,7 +215,7 @@ - tqlayout31 + layout31 @@ -251,7 +251,7 @@ - tqlayout35 + layout35 @@ -297,7 +297,7 @@ - tqlayout29 + layout29 @@ -326,7 +326,7 @@ - tqlayout28 + layout28 @@ -371,7 +371,7 @@ - tqlayout28_2 + layout28_2 @@ -400,7 +400,7 @@ - tqlayout29_2 + layout29_2 @@ -442,7 +442,7 @@ - tqlayout31 + layout31 @@ -461,7 +461,7 @@ - tqlayout52_7 + layout52_7 @@ -524,7 +524,7 @@ - tqlayout52 + layout52 @@ -576,7 +576,7 @@ - tqlayout52_4 + layout52_4 @@ -628,7 +628,7 @@ - tqlayout52_9 + layout52_9 @@ -680,7 +680,7 @@ - tqlayout52 + layout52 @@ -751,7 +751,7 @@ - tqlayout52_9 + layout52_9 @@ -803,7 +803,7 @@ - tqlayout52_5 + layout52_5 @@ -866,7 +866,7 @@ - tqlayout52_5 + layout52_5 @@ -926,7 +926,7 @@ - tqlayout52_8 + layout52_8 @@ -986,7 +986,7 @@ - tqlayout52_7 + layout52_7 @@ -1046,7 +1046,7 @@ - tqlayout52_5 + layout52_5 @@ -1098,7 +1098,7 @@ - tqlayout52_3 + layout52_3 @@ -1150,7 +1150,7 @@ - tqlayout52_6 + layout52_6 @@ -1202,7 +1202,7 @@ - tqlayout52_7 + layout52_7 @@ -1262,7 +1262,7 @@ - tqlayout52_9 + layout52_9 @@ -1316,7 +1316,7 @@ - tqlayout31_3 + layout31_3 @@ -1356,7 +1356,7 @@ - tqlayout33 + layout33 diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index b61cf32c..33af3406 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -198,10 +198,10 @@ void KornCfgImpl::readConfig() { _config->setGroup( "korn" ); - TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper(); - if( tqlayout == TQChar( 'H' ) ) + TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper(); + if( layout == TQChar( 'H' ) ) rbHorizontal->setChecked( true ); - else if( tqlayout == TQChar( 'V' ) ) + else if( layout == TQChar( 'V' ) ) rbVertical->setChecked( true ); else rbDocked->setChecked( true ); @@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig() _config->setGroup( "korn" ); if( rbHorizontal->isChecked() ) - _config->writeEntry( "tqlayout", "Horizontal" ); + _config->writeEntry( "layout", "Horizontal" ); if( rbVertical->isChecked() ) - _config->writeEntry( "tqlayout", "Vertical" ); + _config->writeEntry( "layout", "Vertical" ); if( rbDocked->isChecked() ) - _config->writeEntry( "tqlayout", "Docked" ); + _config->writeEntry( "layout", "Docked" ); //Default is 'false' here, because if no option is set, KWallet isn't used. if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() ) diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index eb3a0253..dc823779 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -95,12 +95,12 @@ void KornShell::readConfig() static bool shownConfig = false; _config->setGroup( "korn" ); - TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper(); + TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper(); KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); - if( tqlayout == 'H' ) + if( layout == 'H' ) _box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); - else if( tqlayout == 'V' ) + else if( layout == 'V' ) _box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" ); else _box = new DockedContainer( TQT_TQOBJECT(this), "docked container" ); diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp index d0818962..9d2f12f6 100644 --- a/korn/maildrop.cpp +++ b/korn/maildrop.cpp @@ -40,10 +40,10 @@ KMailDrop::KMailDrop() connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* ))); //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box. - _bgColour = TQApplication::tqpalette().active().background(); - _fgColour = TQApplication::tqpalette().active().text(); - _nbgColour = TQApplication::tqpalette().active().background(); - _nfgColour = TQApplication::tqpalette().active().text(); + _bgColour = TQApplication::palette().active().background(); + _fgColour = TQApplication::palette().active().text(); + _nbgColour = TQApplication::palette().active().background(); + _nfgColour = TQApplication::palette().active().text(); } KMailDrop::~KMailDrop() @@ -87,10 +87,10 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c) _caption = c.readEntry(fu(CaptionConfigKey)); _clickCmd = c.readPathEntry(fu(ClickConfigKey)); _style = Style(c.readUnsignedNumEntry(fu(DisplayStyleConfigKey), Plain)); - _bgColour = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::tqpalette().active().background()); - _fgColour = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::tqpalette().active().text()); - _nbgColour = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::tqpalette().active().background()); - _nfgColour = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::tqpalette().active().text()); + _bgColour = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::palette().active().background()); + _fgColour = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::palette().active().text()); + _nbgColour = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::palette().active().background()); + _nfgColour = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::palette().active().text()); _icon = c.readEntry(fu(IconConfigKey)); _nIcon = c.readEntry(fu(NewMailIconConfigKey)); _realName = c.readEntry(fu(RealNameConfigKey)); diff --git a/korn/password.cpp b/korn/password.cpp index f0ae5d8f..764b90f9 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc ) { TQString result; for (uint i = 0; i < enc.length(); i++) - result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode()); + result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode()); return result; } diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index 2be856f3..9c891028 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -39,7 +39,7 @@ - tqlayout1 + layout1 diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui index df9baeff..7d7e0227 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/kresources/blogging/resourcebloggingsettings.ui @@ -19,7 +19,7 @@ - tqlayout12 + layout12 diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index 4a7072b5..ab8c7905 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp index b159a021..b2d505df 100644 --- a/kresources/carddav/configwidgets.cpp +++ b/kresources/carddav/configwidgets.cpp @@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp index 0b2764c6..75a8ab81 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/kresources/egroupware/debugdialog.cpp @@ -38,10 +38,10 @@ DebugDialog::DebugDialog() User1 | User2 | Ok, Ok, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); mView = new KTextBrowser( page ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( User1, "Save As..." ); setButtonText( User2, "Clear" ); diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp index 26689315..b23a81a1 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { KDialogBase * dialog = new KDialogBase( ::tqqt_cast(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); -// TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog ); +// TQVBoxLayout * layout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); // populate dialog diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index f05dccf0..9d0f48a5 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel* labelWidget = new TQLabel( label, frame ); - tqlayout->addWidget( labelWidget ); + layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 10 ); + layout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); @@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp index d0a9644e..661f5743 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.cpp +++ b/kresources/scalix/scalixadmin/delegatedialog.cpp @@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true ) { TQWidget *page = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "User:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mEmail = new TQLineEdit( page ); - tqlayout->addWidget( mEmail, 0, 1 ); + layout->addWidget( mEmail, 0, 1 ); TQToolButton *emailSelector = new TQToolButton( page ); emailSelector->setUsesTextLabel( true ); emailSelector->setTextLabel( i18n( "..." ) ); - tqlayout->addWidget( emailSelector, 0, 2 ); + layout->addWidget( emailSelector, 0, 2 ); TQValueList types; types << Scalix::SendOnBehalfOf; @@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) int row = 1; for ( uint i = 0; i < types.count(); ++i ) { TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page ); - tqlayout->addMultiCellWidget( box, row, row, 1, 2 ); + layout->addMultiCellWidget( box, row, row, 1, 2 ); mRights.insert( types[ i ], box ); row++; diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index 32b29d46..03347290 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -37,21 +37,21 @@ DelegatePage::DelegatePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); mView = new DelegateView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this ); mEditButton->setEnabled( false ); - tqlayout->addWidget( mEditButton, 1, 1 ); + layout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2 ); + layout->addWidget( mRemoveButton, 1, 2 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index ab5a417a..98b7b226 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -40,17 +40,17 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 ); mView = new OtherUserView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add Account..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this ); mDeleteButton->setEnabled( false ); - tqlayout->addWidget( mDeleteButton, 1, 1 ); + layout->addWidget( mDeleteButton, 1, 1 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index 401d4de1..e1e331fc 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -36,7 +36,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); @@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) mMessage = new TQTextEdit( this ); mSaveButton = new TQPushButton( i18n( "Save" ), this ); - tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 ); - tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); - tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); - tqlayout->addWidget( mSaveButton, 3, 1 ); + layout->addMultiCellWidget( group, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); + layout->addWidget( mSaveButton, 3, 1 ); statusChanged(); diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index e75d3fdd..de1a9aac 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -38,29 +38,29 @@ PasswordPage::PasswordPage( TQWidget *parent ) : TQWidget( parent ), mJob( 0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "New password:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPassword = new TQLineEdit( this ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( mPassword, 0, 1 ); + layout->addWidget( mPassword, 0, 1 ); label = new TQLabel( i18n( "Retype new password:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mPasswordRetype = new TQLineEdit( this ); mPasswordRetype->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPasswordRetype ); - tqlayout->addWidget( mPasswordRetype, 1, 1 ); + layout->addWidget( mPasswordRetype, 1, 1 ); mButton = new TQPushButton( i18n( "Change" ), this ); mButton->setEnabled( false ); - tqlayout->addWidget( mButton, 2, 1 ); + layout->addWidget( mButton, 2, 1 ); - tqlayout->setRowSpacing( 3, 1 ); + layout->setRowSpacing( 3, 1 ); connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 2227e663..010dd920 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -211,7 +211,7 @@ - tqlayout2 + layout2 diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h index 33a4a67c..7400e896 100644 --- a/ktnef/gui/wmfstruct.h +++ b/ktnef/gui/wmfstruct.h @@ -53,7 +53,7 @@ struct WmfEnhMetaHeader WORD nHandles; // Number of handles in the handle table // Handle index zero is reserved. WORD sReserved; // Reserved. Must be zero. - DWORD nDescription; // Number of chars in the tqunicode description string + DWORD nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef index d1de851a..aea529ec 100644 Binary files a/ktnef/tests/mapi_attach_data_obj.tnef and b/ktnef/tests/mapi_attach_data_obj.tnef differ diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index 3022d7cc..9c346f48 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label : KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel *labelWidget = new TQLabel( label, frame ); - tqlayout->addWidget( labelWidget ); + layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 10 ); + layout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), TQT_SLOT(slotOk()) ); @@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 086323b0..61818b9d 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences ) bool DndFactory::copyIncidences( const Incidence::List &incidences ) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); CalendarLocal cal( mCalendar->timeZoneId() ); Incidence::List::ConstIterator it; @@ -206,7 +206,7 @@ bool DndFactory::copyIncidence( Incidence *selectedInc ) Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); Incidence::List list; if ( !ICalDrag::decode( cb->data(), &cal ) && @@ -249,7 +249,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime Incidence *DndFactory::pasteIncidence( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if ( !ICalDrag::decode( cb->data(), &cal ) && !VCalDrag::decode( cb->data(), &cal ) ) { diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index f5529dd3..5f38fe00 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -391,7 +391,7 @@ c. values of a property is determined by the property definition itself. The vobject APIs does not attempt to enforce any of such definition. It is the consumer responsibility to know what value is expected from a property. e.g - most properties have tqunicode string value, so to access + most properties have unicode string value, so to access the value of these type of properties, you will use the vObjectUStringZValue() to read the value and setVObjectUStringZValue() to set or modify the value. @@ -498,7 +498,7 @@ d. properties name (id) are case incensitive. const wchar_t* vObjectUStringZValue(VObject *o); -- retrieve the VObject's value interpreted as - null-terminated tqunicode string. + null-terminated unicode string. unsigned int vObjectIntegerValue(VObject *o); -- retrieve the VObject's value interpreted as @@ -578,7 +578,7 @@ d. properties name (id) are case incensitive. -- convert char* to wchar_t*. extern int uStrLen(const wchar_t *u); - -- length of tqunicode u. + -- length of unicode u. char *fakeCString(const wchar_t *u); -- convert wchar_t to CString (blindly assumes that diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp index eb8deb8a..6eca383f 100644 --- a/libkmime/kmime_content.cpp +++ b/libkmime/kmime_content.cpp @@ -439,25 +439,25 @@ void Content::decodedText(TQStringList &l, bool trimText, if(!decodeText()) //this is not a text content !! return; - TQString tqunicode; + TQString unicode; bool ok=true; TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); - tqunicode=codec->toUnicode(b_ody.data(), b_ody.length()); + unicode=codec->toUnicode(b_ody.data(), b_ody.length()); if (trimText && removeTrailingNewlines) { int i; - for (i=tqunicode.length()-1; i>=0; i--) - if (!tqunicode[i].isSpace()) + for (i=unicode.length()-1; i>=0; i--) + if (!unicode[i].isSpace()) break; - tqunicode.truncate(i+1); + unicode.truncate(i+1); } else { - if (tqunicode.right(1)=="\n") - tqunicode.truncate(tqunicode.length()-1); // remove trailing new-line + if (unicode.right(1)=="\n") + unicode.truncate(unicode.length()-1); // remove trailing new-line } - l=TQStringList::split('\n', tqunicode, true); //split the string at linebreaks + l=TQStringList::split('\n', unicode, true); //split the string at linebreaks } diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index a6af3053..251a7737 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -722,7 +722,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) // check whether uid was utf-8 encoded bool isUtf8 = true; for ( unsigned int i = 0; i + 1 < uidString.length(); ++i ) { - if ( uidString[i].tqunicode() == 0xdbff && + if ( uidString[i].unicode() == 0xdbff && uidString[i+1].row() == 0xde ) { // we found a non-Unicode character (see TQString::fromUtf8()) isUtf8 = false; diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 19323854..37533220 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Warning"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // (mmutz) work around TQt label bug in 3.0.0 (and possibly later): // 1. Don't use rich text: No ... label = new TQLabel( i18n("Please check if encryption really " @@ -132,7 +132,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) topLayout->addWidget( group ); group = new TQVGroupBox( i18n("Encryption Tool"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); TQHBox * hbox = new TQHBox( group ); label = new TQLabel( i18n("Select encryption tool to &use:"), hbox ); @@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) topLayout->addWidget( group ); mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this ); - mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() ); storePass = new TQCheckBox( i18n("&Keep passphrase in memory"), mpOptionsGroupBox ); connect( storePass, TQT_SIGNAL( toggled( bool ) ), @@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text, mEditBox->setReadOnly(true); topLayout->addWidget( mEditBox, 10 ); - TQString tqunicodeText; + TQString unicodeText; if (charset.isEmpty()) - tqunicodeText = TQString::fromLocal8Bit(text.data()); + unicodeText = TQString::fromLocal8Bit(text.data()); else { bool ok=true; TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok); if(!ok) - tqunicodeText = TQString::fromLocal8Bit(text.data()); + unicodeText = TQString::fromLocal8Bit(text.data()); else - tqunicodeText = codec->toUnicode(text.data(), text.length()); + unicodeText = codec->toUnicode(text.data(), text.length()); } - mEditBox->setText(tqunicodeText); + mEditBox->setText(unicodeText); setMinimumSize(); } void CipherTextDialog::setMinimumSize() { - // this seems to force a tqlayout of the entire document, so we get a + // this seems to force a layout of the entire document, so we get a // a proper contentsWidth(). Is there a better way? for ( int i = 0; i < mEditBox->paragraphs(); i++ ) (void) mEditBox->paragraphRect( i ); diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index a2271053..0f15b100 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr ) { TQString result; for (uint i = 0; i < aStr.length(); i++) - result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 1e827d80..d076fd3d 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -344,7 +344,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e ) { // reimplemented from TQLineEdit::mouseReleaseEvent() if ( m_useCompletion - && TQApplication::tqclipboard()->supportsSelection() + && TQApplication::clipboard()->supportsSelection() && !isReadOnly() && e->button() == Qt::MidButton ) { m_smartPaste = true; diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index b3fbae4c..c763545a 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -267,7 +267,7 @@ void AddresseeSelector::init() void AddresseeSelector::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() ); TQLabel *label = new TQLabel( i18n( "Address book:" ), this ); @@ -284,7 +284,7 @@ void AddresseeSelector::initGUI() topLayout->setColStretch( 1, 1 ); - tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); + layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); int row = 1; @@ -304,7 +304,7 @@ void AddresseeSelector::initGUI() TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); buttonLayout->setAlignment( TQt::AlignBottom ); - tqlayout->addLayout( buttonLayout, row, 1 ); + layout->addLayout( buttonLayout, row, 1 ); // move button TQToolButton *moveButton = new TQToolButton( this ); @@ -327,7 +327,7 @@ void AddresseeSelector::initGUI() buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); - tqlayout->addWidget( listView, row, 2 ); + layout->addWidget( listView, row, 2 ); } mAddresseeView = new KListView( this ); @@ -335,7 +335,7 @@ void AddresseeSelector::initGUI() mAddresseeView->header()->hide(); mAddresseeView->setFullWidth( true ); - tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); + layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); } void AddresseeSelector::finish() @@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) { TQFrame *frame = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); + TQVBoxLayout *layout = new TQVBoxLayout( frame ); mSelector = new KPIM::AddresseeSelector( selection, frame ); - tqlayout->addWidget( mSelector ); + layout->addWidget( mSelector ); resize( 500, 490 ); } diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index a11680ff..8469730a 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -66,7 +66,7 @@ - tqlayout10 + layout10 @@ -209,7 +209,7 @@ - tqlayout1 + layout1 diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index 72e1de8a..a6ab6e77 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, TQWidget *widget = new TQWidget( this ); setMainWidget( widget ); - TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); d->mView = new TQListView( widget ); d->mView->addColumn( "" ); d->mView->header()->hide(); d->mView->setDefaultRenameAction( TQListView::Accept ); - tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); + layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); d->mAddButton = new TQPushButton( i18n( "Add" ), widget ); - tqlayout->addWidget( d->mAddButton, 0, 1 ); + layout->addWidget( d->mAddButton, 0, 1 ); d->mEditButton = new TQPushButton( i18n( "Edit" ), widget ); - tqlayout->addWidget( d->mEditButton, 1, 1 ); + layout->addWidget( d->mEditButton, 1, 1 ); d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget ); - tqlayout->addWidget( d->mDeleteButton, 2, 1 ); + layout->addWidget( d->mDeleteButton, 2, 1 ); fillList(); diff --git a/libtdepim/categoryeditdialog_base.ui b/libtdepim/categoryeditdialog_base.ui index 39d69dc7..9064bce3 100644 --- a/libtdepim/categoryeditdialog_base.ui +++ b/libtdepim/categoryeditdialog_base.ui @@ -54,7 +54,7 @@ - tqlayout103 + layout103 diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index a95daad6..d773c7d6 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -73,10 +73,10 @@ namespace KPIM { mMetrics( pdm ) { // initialize with defaults - should match the corresponding application defaults - mForegroundColor = TQApplication::tqpalette().active().text(); + mForegroundColor = TQApplication::palette().active().text(); mLinkColor = KGlobalSettings::linkColor(); mVisitedLinkColor = KGlobalSettings::visitedLinkColor(); - mBackgroundColor = TQApplication::tqpalette().active().base(); + mBackgroundColor = TQApplication::palette().active().base(); cHtmlWarning = TQColor( 0xFF, 0x40, 0x40 ); // warning frame color: light red cPgpEncrH = TQColor( 0x00, 0x80, 0xFF ); // light blue @@ -216,7 +216,7 @@ namespace KPIM { " font-size: %2pt ! important;\n" ) .arg( mPrintFont.family() ) .arg( mPrintFont.pointSize() ); - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); const TQFont printFont = bodyFont( fixed, true /* print */ ); TQString quoteCSS; @@ -308,7 +308,7 @@ namespace KPIM { : TQString( " background-color: %1 ! important;\n" ) .arg( bgColor ) ); const TQString bodyFontSize = TQString::number( pointsToPixel( helper->mMetrics, fontSize( fixed ) ) ) + "px" ; - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); TQString quoteCSS; if ( bodyFont( fixed ).italic() ) diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 50c05593..c30d1986 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, void DesignerFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this ); if ( !wdg ) { @@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) mTitle = wdg->caption(); mIdentifier = wdg->name(); - tqlayout->addWidget( wdg ); + layout->addWidget( wdg ); TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 3c32f832..7a459530 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -41,8 +41,8 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); new TQLabel( i18n("Showing URL %1").arg( url ), this ); } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 168f7f50..d40d3f4b 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -261,7 +261,7 @@ void KCMDesignerFields::defaults() void KCMDesignerFields::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); bool noDesigner = KStandardDirs::findExe("designer").isEmpty(); @@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI() i18n("Warning: TQt Designer could not be found. It is probably not " "installed. You will only be able to import existing designer files."); TQLabel *lbl = new TQLabel( txt, this ); - tqlayout->addWidget( lbl ); + layout->addWidget( lbl ); } - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); mPageView = new KListView( this ); mPageView->addColumn( i18n( "Available Pages" ) ); @@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI() loadUiFiles(); - hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); + hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); TQString cwHowto = i18n("

    This section allows you to add your own GUI" " Elements ('Widgets') to store your own values" diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 79ad6aa9..e1e887be 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -390,10 +390,10 @@ void KFolderTree::setStyleDependantFrameWidth() { // set the width of the frame to a reasonable value for the current GUI style int frameWidth; - if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + if( style().isA("KeramikStyle") ) + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 4f9a081a..8d3a87f4 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -75,7 +75,7 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, : m_reference( reference ) { m_box = new TQGroupBox( 0, TQt::Vertical, text, parent ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() ); boxLayout->setAlignment( TQt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index a83a5a7a..f25ec3cd 100644 --- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -29,8 +29,8 @@ KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); } void KPartsGenericPart::load() diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 81602872..047f16d2 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate() kdDebug() << "ITEMS: " << (*it)->name() << endl; TQWidget *page; - TQGridLayout *tqlayout; + TQGridLayout *layout; int currentRow; if ( !mGroupPages.contains( group ) ) { page = addPage( group ); - tqlayout = new TQGridLayout( page ); + layout = new TQGridLayout( page ); mGroupPages.insert( group, page ); - mGroupLayouts.insert( group, tqlayout ); + mGroupLayouts.insert( group, layout ); currentRow = 0; mCurrentRows.insert( group, currentRow ); } else { page = mGroupPages[ group ]; - tqlayout = mGroupLayouts[ group ]; + layout = mGroupLayouts[ group ]; currentRow = mCurrentRows[ group ]; } @@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate() if ( wid ) { TQValueList widgets = wid->widgets(); if ( widgets.count() == 1 ) { - tqlayout->addMultiCellWidget( widgets[ 0 ], + layout->addMultiCellWidget( widgets[ 0 ], currentRow, currentRow, 0, 1 ); } else if ( widgets.count() == 2 ) { - tqlayout->addWidget( widgets[ 0 ], currentRow, 0 ); - tqlayout->addWidget( widgets[ 1 ], currentRow, 1 ); + layout->addWidget( widgets[ 0 ], currentRow, 0 ); + layout->addWidget( widgets[ 1 ], currentRow, 1 ); } else { kdError() << "More widgets than expected: " << widgets.count() << endl; } diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index b1fffcdd..907989f8 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -87,7 +87,7 @@ class KDE_EXPORT KPrefsWid : public TQObject @short Widgets for bool settings in @ref KPrefsDialog. This class provides a control element for configuring bool values. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidBool : public KPrefsWid { @@ -120,7 +120,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid @short Widgets for int settings in @ref KPrefsDialog. This class provides a control element for configuring integer values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @@ -161,7 +161,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring time values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @@ -198,7 +198,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @short Widgets for duration settings in @ref KPrefsDialog. This class provides a control element for configuring duration values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @@ -236,7 +236,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring date values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @@ -273,7 +273,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @short Widgets for color settings in @ref KPrefsDialog. This class provides a control element for configuring color values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @@ -317,7 +317,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @short Widgets for font settings in @ref KPrefsDialog. This class provides a control element for configuring font values. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidFont : public KPrefsWid { @@ -371,7 +371,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. The setting is interpreted as an int value, corresponding to the position of the radio button. The position of the button is defined by the sequence of @@ -420,7 +420,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. The setting is interpreted as an int value, corresponding to the index in the combo box. @@ -455,7 +455,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidString : public KPrefsWid @@ -502,7 +502,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidPath : public KPrefsWid @@ -711,7 +711,7 @@ class KDE_EXPORT KPrefsWidManager This class provides the framework for a preferences dialog. You have to subclass it and add the code to create the actual configuration widgets and - do the tqlayout management. + do the layout management. KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via KPrefsWidManager. For these widgets the reading, writing and setting to diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index f1c5b657..f61b633c 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, else groupView->header()->setStretchEnabled(true, 0); - // tqlayout + // layout TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint()); TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint()); TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint()); diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index 458292bc..546bbb32 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w) void KWidgetLister::removeLastWidget() { - // The tqlayout will take care that the + // The layout will take care that the // widget is removed from screen, too. mWidgetList.removeLast(); enableControls(); diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index 6bfeec15..ebe9c141 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -74,19 +74,19 @@ protected slots: /** Called whenever the user clicks on the 'more' button. Reimplementations should call this method, because this implementation does all the dirty work with adding the widgets - to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling + to the layout (through @ref addWidgetAtEnd) and enabling/disabling the control buttons. */ virtual void slotMore(); /** Called whenever the user clicks on the 'fewer' button. Reimplementations should call this method, because this implementation does all the dirty work with removing the widgets - from the tqlayout (through @ref removeLastWidget) and + from the layout (through @ref removeLastWidget) and enabling/disabling the control buttons. */ virtual void slotFewer(); /** Called whenever the user clicks on the 'clear' button. Reimplementations should call this method, because this implementation does all the dirty work with removing all but - @ref mMinWidgets widgets from the tqlayout and enabling/disabling + @ref mMinWidgets widgets from the layout and enabling/disabling the control buttons. */ virtual void slotClear(); diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 941253a4..53bfba32 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 8738788f..d71bc875 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -176,7 +176,7 @@ TQString LinkLocator::getEmailAddress() // determine the local part of the email address int start = mPos - 1; - while ( start >= 0 && mText[start].tqunicode() < 128 && + while ( start >= 0 && mText[start].unicode() < 128 && ( mText[start].isLetterOrNumber() || mText[start] == '@' || // allow @ to find invalid email addresses allowedSpecialChars.find( mText[start] ) != -1 ) ) { diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h index 1ad9dfa3..bb4a89de 100644 --- a/libtdepim/overlaywidget.h +++ b/libtdepim/overlaywidget.h @@ -35,11 +35,11 @@ namespace KPIM { /** - * This is a widget that can align itself with another one, without using a tqlayout, + * This is a widget that can align itself with another one, without using a layout, * so that it can actually be on top of other widgets. * Currently the only supported type of alignment is "right aligned, on top of the other widget". * - * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) + * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame) */ class OverlayWidget : public TQHBox { diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index b9e19614..b058194b 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -84,7 +84,7 @@ void TransactionItemView::resizeContents( int w, int h ) // (handling of TQEvent::LayoutHint in TQScrollView calls this method) //kdDebug(5300) << k_funcinfo << w << "," << h << endl; TQScrollView::resizeContents( w, h ); - // Tell the tqlayout in the parent (progressdialog) that our size changed + // Tell the layout in the parent (progressdialog) that our size changed updateGeometry(); // Resize the parent (progressdialog) - this works but resize horizontally too often //parentWidget()->adjustSize(); diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp index b0076172..d390e649 100644 --- a/libtdepim/qutf7codec.cpp +++ b/libtdepim/qutf7codec.cpp @@ -137,10 +137,10 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const } class TQUtf7Decoder : public TQTextDecoder { - // the storage for our tqunicode char until it's finished + // the storage for our unicode char until it's finished ushort uc; // the state of the base64 decoding - // can be 0 (just finished three tqunicode chars) + // can be 0 (just finished three unicode chars) // 1 (have the upper 6 bits of uc already) // 2 (have the upper 12 bits of uc already) // 3 (have the upper 2 bits of uc already) @@ -148,7 +148,7 @@ class TQUtf7Decoder : public TQTextDecoder { // 7 (have the upper 10 bits of uc already) // => n (have the upper (n * 6) % 16 bits of uc already) // "stepNo" cycles through all it's values every three - // tqunicode chars. + // unicode chars. char stepNo; // remembers if we are in shifted-sequence mode bool shifted; @@ -462,7 +462,7 @@ public: #endif // source and destination cursor - const TQChar * s = uc.tqunicode(); + const TQChar * s = uc.unicode(); TQCString::Iterator t = result.data(); if ( uc.isNull() ) { @@ -473,7 +473,7 @@ public: // normal operation: for (int i = 0 ; i < len_in_out ; i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) { - ushort ch = s[i].tqunicode(); + ushort ch = s[i].unicode(); // // first, we check whether we might get around encoding: diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index ac790693..df7a4549 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) parent, name, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false, KEditListBox::Add | KEditListBox::Remove ); - tqlayout->addWidget( mEditor ); + layout->addWidget( mEditor ); } void RecentAddressDialog::setAddresses( const TQStringList &addrs ) diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 0232a782..2fb4efe4 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); mMessageLength->setAlignment( TQt::AlignRight ); - tqlayout->addWidget( mMessageLength, 0, 2 ); + layout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); - tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 ); + layout->addMultiCellWidget( mText, 1, 1, 0, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); - tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); + layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); + layout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); setButtonText( Ok, i18n( "Send" ) ); diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index 46fabcfe..4a7f981e 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -34,10 +34,10 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); KDateEdit *edit = new KDateEdit( this ); - tqlayout->addWidget( edit ); + layout->addWidget( edit ); connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), this, TQT_SLOT( dateChanged( const TQDate& ) ) ); diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 5311858f..dae65dc3 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent) ui = new AttendeeSelectorWidget( this ); setMainWidget( ui ); - TQGridLayout *tqlayout = static_cast( ui->tqlayout() ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = static_cast( ui->layout() ); + layout->setMargin( 0 ); ui->addButton->setGuiItem( KStdGuiItem::add() ); connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) ); diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index ef8a2b51..dd2fa036 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -33,11 +33,11 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name ) { setCaption( i18n( "KDE Groupware Wizard" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mOverViewPage = new OverViewPage( this ); - tqlayout->addWidget( mOverViewPage ); + layout->addWidget( mOverViewPage ); connect( mOverViewPage, TQT_SIGNAL( cancel() ), tqApp, TQT_SLOT( quit() ) ); diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 15df0246..8dcea2bb 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -43,29 +43,29 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(), KDialog::spacingHint() ); const TQString msg = i18n( "KDE Groupware Wizard" ); TQLabel *label = new TQLabel( "

    " + msg + "

    " , this ); - tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 ); + layout->addMultiCellWidget( label, 0, 0, 0, 2 ); label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) ); - tqlayout->addWidget( label, 0, 3 ); + layout->addWidget( label, 0, 3 ); label = new TQLabel( "", this ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->setRowSpacing( 1, 20 ); + layout->addWidget( label, 1, 0 ); + layout->setRowSpacing( 1, 20 ); label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this ); - tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 ); + layout->addMultiCellWidget( label, 2, 2, 0, 3 ); TQPushButton *button; #ifdef WITH_EGROUPWARE button = new TQPushButton( i18n("eGroupware"), this ); - tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 ); + layout->addMultiCellWidget( button, 3, 3, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) ); #endif @@ -73,33 +73,33 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_KOLAB button = new TQPushButton( i18n("Kolab"), this ); - tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 ); + layout->addMultiCellWidget( button, 4, 4, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) ); #endif #ifdef WITH_SLOX button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this ); - tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 ); + layout->addMultiCellWidget( button, 5, 5, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) ); #endif #ifdef WITH_NEWEXCHANGE button = new TQPushButton( i18n("Microsoft Exchange"), this ); button->hide(); // not quite ready yet - tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 ); + layout->addMultiCellWidget( button, 6, 6, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) ); #endif TQFrame *frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 ); + layout->addMultiCellWidget( frame, 7, 7, 0, 3 ); TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this ); - tqlayout->addWidget( cancelButton, 8, 3 ); + layout->addWidget( cancelButton, 8, 3 ); connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) ); - tqlayout->setRowStretch( 7, 1 ); + layout->setRowStretch( 7, 1 ); KAcceleratorManager::manage( this ); } -- cgit v1.2.3