diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index df9a6bd3..f206907b 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -91,7 +91,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout38 + layout38 @@ -259,7 +259,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout33 + layout33 @@ -461,7 +461,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout39 + layout39 @@ -954,7 +954,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout56 + layout56 @@ -1044,7 +1044,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout55 + layout55 @@ -1202,7 +1202,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout55 + layout55 @@ -4776,7 +4776,7 @@ Only change something if you know what you are doing. - tqunicodeChk + unicodeChk U&nicode @@ -8243,7 +8243,7 @@ This is only available if the SSL libraries have been compiled on your system an logonDriveEdit logonPathUrlRq logonHomeUrlRq - tqunicodeChk + unicodeChk displayCharsetEdit unixCharsetEdit dosCharsetEdit diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 332f063c..57c96424 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -919,7 +919,7 @@ void KcmSambaConf::loadCharset(SambaShare* ) _dictMngr->add("character set", _interface->characterSetEdit); _dictMngr->add("valid chars", _interface->validCharsEdit); - _dictMngr->add("tqunicode",_interface->tqunicodeChk); + _dictMngr->add("unicode",_interface->unicodeChk); } void KcmSambaConf::loadWinbind(SambaShare* ) diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 0ba2082b..fa601072 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -227,14 +227,14 @@ void PrinterDlgImpl::printersChkToggled(bool b) pix.setMask(mask); printerPixLbl->setPixmap(pix); - pixFrame->tqlayout()->setMargin( 2 ); + pixFrame->layout()->setMargin( 2 ); } else { shareNameEdit->setEnabled(true); shareNameEdit->setText( _share->getName() ); printerPixLbl->setPixmap(DesktopIcon("printer1")); - pixFrame->tqlayout()->setMargin( 11 ); + pixFrame->layout()->setMargin( 11 ); } } diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 52971d94..ba600d17 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -735,7 +735,7 @@ - tqlayout18 + layout18 @@ -799,7 +799,7 @@ - tqlayout52 + layout52 @@ -2453,7 +2453,7 @@ Only change something if you know what you are doing. - tqlayout9 + layout9 diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 46a8bc8b..00181eaa 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -43,7 +43,7 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) : TQWidget(parent,"configWidget") { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this,5); + TQVBoxLayout *layout = new TQVBoxLayout(this,5); TQLabel *lbl = new TQLabel(i18n("

The SAMBA configuration file 'smb.conf'" \ " could not be found;

" \ @@ -59,9 +59,9 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) hbox->addStretch(); hbox->addWidget(btn); - tqlayout->addWidget(lbl); - tqlayout->addLayout(hbox); - tqlayout->addStretch(); + layout->addWidget(lbl); + layout->addLayout(hbox); + layout->addStretch(); } void SmbConfConfigWidget::btnPressed() { diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index 4fa41052..d3775c32 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -348,7 +348,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout15 + layout15 @@ -394,7 +394,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout16 + layout16 diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index ecc93a7d..bd4c3cbd 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -62,8 +62,8 @@ void NFSDialog::initGUI() { TQWidget* page = plainPage(); m_gui = new NFSDialogGUI(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); - tqlayout->addWidget( m_gui ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); + layout->addWidget( m_gui ); KAccel* accel = new KAccel( m_gui->listView ); accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost())); diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index c6bc1e20..e45f1f87 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -41,8 +41,8 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry) m_gui = new HostProps(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, 6 ); - tqlayout->addWidget( m_gui ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 ); + layout->addWidget( m_gui ); connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified())); diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index 5beb1a81..a41de020 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui +++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -108,7 +108,7 @@ - tqlayout6 + layout6 @@ -157,7 +157,7 @@ - tqlayout4 + layout4 @@ -216,7 +216,7 @@ - tqlayout3 + layout3 @@ -239,7 +239,7 @@ - tqlayout5 + layout5 @@ -288,7 +288,7 @@ - tqlayout3 + layout3 diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index c9fa3f12..7eec18af 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -66,7 +66,7 @@ - tqlayout4 + layout4 @@ -131,7 +131,7 @@ - tqlayout4_2 + layout4_2 @@ -185,7 +185,7 @@ - tqlayout3 + layout3 @@ -251,7 +251,7 @@ - tqlayout10 + layout10 diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 2a81f704..5b796823 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -65,13 +65,13 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS { KGlobal::locale()->insertCatalogue("kfileshare"); - TQBoxLayout* tqlayout = new TQVBoxLayout(this,0, + TQBoxLayout* layout = new TQVBoxLayout(this,0, KDialog::spacingHint()); /* TQVButtonGroup *box = new TQVButtonGroup( i18n("File Sharing"), this ); - box->tqlayout()->setSpacing( KDialog::spacingHint() ); - tqlayout->addWidget(box); + box->layout()->setSpacing( KDialog::spacingHint() ); + layout->addWidget(box); noSharing=new TQRadioButton( i18n("Do ¬ allow users to share files"), box ); sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"), box); */ @@ -106,7 +106,7 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS } m_ccgui->infoLbl->hide(); - tqlayout->addWidget(m_ccgui); + layout->addWidget(m_ccgui); updateShareListView(); connect( KNFSShare::instance(), TQT_SIGNAL( changed()), this, TQT_SLOT(updateShareListView())); diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui index fd9a436c..13b26dc3 100644 --- a/filesharing/simple/groupconfiggui.ui +++ b/filesharing/simple/groupconfiggui.ui @@ -124,7 +124,7 @@ - tqlayout2 + layout2 diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h index 9e7cd8a1..513e1280 100644 --- a/filesharing/simple/krichtextlabel.h +++ b/filesharing/simple/krichtextlabel.h @@ -24,7 +24,7 @@ #include /** - * @short A replacement for TQLabel that supports richtext and proper tqlayout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian */ diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 7d7ea958..61a8bc70 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -388,14 +388,14 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int) rightBtnMenu->insertSeparator(); } - kapp->tqclipboard()->setSelectionMode(false); - TQString text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(false); + TQString text = kapp->clipboard()->text(); if (text.isEmpty()) { - kapp->tqclipboard()->setSelectionMode(true); - text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(true); + text = kapp->clipboard()->text(); } if (!text.isEmpty()) { - popupClip = kapp->tqclipboard()->text(); + popupClip = kapp->clipboard()->text(); rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQT_SLOT(popupMatchClip())); rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQT_SLOT(popupDefineClip())); rightBtnMenu->insertSeparator(); diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 81761e2e..0569e499 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -276,7 +276,7 @@ void QueryView::selectAll() void QueryView::copySelection() { - kapp->tqclipboard()->setText(part->selectedText()); + kapp->clipboard()->setText(part->selectedText()); } @@ -441,14 +441,14 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) this,TQT_SLOT(popupMatchSelect())); rightBtnMenu->insertSeparator(); } else { - kapp->tqclipboard()->setSelectionMode(false); - TQString text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(false); + TQString text = kapp->clipboard()->text(); if (text.isEmpty()) { - kapp->tqclipboard()->setSelectionMode(true); - text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(true); + text = kapp->clipboard()->text(); } if (!text.isEmpty()) { - popupSelect = TQApplication::tqclipboard()->text(); + popupSelect = TQApplication::clipboard()->text(); rightBtnMenu->insertItem(SmallIcon("define_clip"), i18n("&Define Clipboard Content"), this,TQT_SLOT(popupDefineSelect())); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 27211085..17374766 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -260,11 +260,11 @@ void TopLevel::define(const TQString &query) void TopLevel::defineClipboard() { kdDebug(5004) << "TopLevel::defineClipboard()" << endl; - kapp->tqclipboard()->setSelectionMode(true); - TQString text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(true); + TQString text = kapp->clipboard()->text(); if (text.isEmpty()) { - kapp->tqclipboard()->setSelectionMode(false); - text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(false); + text = kapp->clipboard()->text(); } define(text); } @@ -281,11 +281,11 @@ void TopLevel::match(const TQString &query) void TopLevel::matchClipboard() { kdDebug(5004) << "TopLevel::matchClipboard()" << endl; - kapp->tqclipboard()->setSelectionMode(true); - TQString text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(true); + TQString text = kapp->clipboard()->text(); if (text.isEmpty()) { - kapp->tqclipboard()->setSelectionMode(false); - text = kapp->tqclipboard()->text(); + kapp->clipboard()->setSelectionMode(false); + text = kapp->clipboard()->text(); } match(text); } diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index 9b46fadb..1c86ec64 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -106,7 +106,7 @@ - tqlayout12 + layout12 diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 938ad205..535393b0 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -56,7 +56,7 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) actionSelectAll->plug( toolBar() ); TQWidget *mainWidget = new TQWidget( this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( mainWidget ); + TQVBoxLayout *layout = new TQVBoxLayout( mainWidget ); setCentralWidget( mainWidget ); m_view = new KListView( mainWidget, "listview" ); @@ -68,8 +68,8 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) m_view->setShowSortIndicator( true ); KListViewSearchLineWidget *line = new KListViewSearchLineWidget( m_view, mainWidget, "search line" ); - tqlayout->addWidget( line ); - tqlayout->addWidget( m_view ); + layout->addWidget( line ); + layout->addWidget( m_view ); // setting a fixed (not floating) toolbar toolBar()->setMovingEnabled( false ); diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index e6f2c5a4..8c7b63ab 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -151,7 +151,7 @@ KMainWidget::KMainWidget(bool bStartDocked) logFileName = locateLocal("appdata", "logs/"); logFileName += tmp; - lastClipboard = TQApplication::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); + lastClipboard = TQApplication::clipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); // Load all settings from KConfig ksettings.load(); @@ -997,7 +997,7 @@ void KMainWidget::slotCheckClipboard() //sDebugIn << endl; #endif - TQString clipData = TQApplication::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); + TQString clipData = TQApplication::clipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); if (clipData != lastClipboard) { sDebug << "New clipboard event" << endl; @@ -1026,7 +1026,7 @@ void KMainWidget::slotPasteTransfer() TQString newtransfer; - newtransfer = TQApplication::tqclipboard()->text(); + newtransfer = TQApplication::clipboard()->text(); newtransfer = newtransfer.stripWhiteSpace(); if (!ksettings.b_expertMode) { @@ -1593,7 +1593,7 @@ void KMainWidget::slotCopyToClipboard() if (item) { TQString url = item->getSrc().url(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( url, TQClipboard::Selection ); cb->setText( url, TQClipboard::Clipboard); myTransferList->clearSelection(); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 562432f5..2def3372 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -75,7 +75,7 @@ TransferList::TransferList(TQWidget * parent, const char *name) jobid=1; - // initial tqlayout + // initial layout KConfig *config = KGlobal::config(); config->setGroup("ListView"); if ( config->readListEntry("ColumnWidths").isEmpty() ) diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 535485bf..89c78232 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -47,7 +47,7 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget I18N_NOOP("A news ticker applet."), KAboutData::License_BSD, I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers"))) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); m_contextMenu = new KNewsTickerMenu(this); connect(m_contextMenu, TQT_SIGNAL(aboutToHide()), @@ -59,10 +59,10 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed())); m_arrowButton->setFocusPolicy(TQ_NoFocus); setupArrowButton(); - tqlayout->addWidget(m_arrowButton); + layout->addWidget(m_arrowButton); m_scroller = new NewsScroller(this, m_cfg); - tqlayout->addWidget(m_scroller); + layout->addWidget(m_scroller); m_dcopClient->registerAs("knewsticker", false); @@ -257,21 +257,21 @@ void KNewsTicker::slotArrowButtonPressed() void KNewsTicker::positionChange(Position) { - delete tqlayout(); + delete layout(); - TQBoxLayout *tqlayout; + TQBoxLayout *layout; if (orientation() ==Qt::Horizontal) - tqlayout = new TQHBoxLayout(this); + layout = new TQHBoxLayout(this); else - tqlayout = new TQVBoxLayout(this); + layout = new TQVBoxLayout(this); if (m_arrowButton) { - tqlayout->addWidget(m_arrowButton); + layout->addWidget(m_arrowButton); setupArrowButton(); } - tqlayout->addWidget(m_scroller); + layout->addWidget(m_scroller); } void KNewsTicker::slotContextMenuAboutToHide() diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index 19e1f6e8..04ab9f9a 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -30,7 +30,7 @@ - tqlayout8 + layout8 diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui index 860e0e8e..f652cb2e 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui @@ -44,7 +44,7 @@ - tqlayout3 + layout3 diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui index f0b20fb4..4cd6e1ef 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui @@ -46,7 +46,7 @@ - tqlayout3 + layout3 diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index 951bdbff..cc8d9ce0 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -28,7 +28,7 @@ - tqlayout21 + layout21 @@ -66,7 +66,7 @@ - tqlayout19 + layout19 @@ -130,7 +130,7 @@ - tqlayout21_2 + layout21_2 @@ -168,7 +168,7 @@ - tqlayout25 + layout25 diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 4e29627c..e7421438 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -955,13 +955,13 @@ void ChatMessagePart::copy(bool justselection /* default false */) htmltextdrag->setSubtype("html"); drag->addDragObject( htmltextdrag ); } - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); #else if(!justselection) - TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); #endif connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); @@ -1130,7 +1130,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // hash contactId to deterministically pick a color for the contact int hash = 0; for( uint f = 0; f < contactId.length(); ++f ) - hash += contactId[f].tqunicode() * f; + hash += contactId[f].unicode() * f; const TQString colorName = nameColors[ hash % nameColorsLen ]; TQString lightColorName; // Do not initialize, TQColor::name() is expensive! kdDebug(14000) << k_funcinfo << "Hash " << hash << " has color " << colorName << endl; diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index efb2a668..4f356690 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -317,7 +317,7 @@ void ChatView::makeVisible() if ( !m_mainWindow->isVisible() ) { m_mainWindow->show(); - // scroll down post show and tqlayout, otherwise the geometry is wrong to scroll to the bottom. + // scroll down post show and layout, otherwise the geometry is wrong to scroll to the bottom. m_messagePart->keepScrolledDown(); } diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index 16faf54f..321adac8 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -140,7 +140,7 @@ The icon of every contact of this account will be coloured with this color. Usef - tqlayout27 + layout27 diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui index 35fa6489..67dbaa07 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui @@ -96,7 +96,7 @@ - tqlayout10 + layout10 diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui index 12afec52..8943bc6c 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -203,7 +203,7 @@ - tqlayout9 + layout9 @@ -228,7 +228,7 @@ - tqlayout8 + layout8 @@ -236,7 +236,7 @@ - tqlayout5 + layout5 @@ -265,7 +265,7 @@ - tqlayout6 + layout6 @@ -294,7 +294,7 @@ - tqlayout7 + layout7 @@ -327,7 +327,7 @@ - tqlayout6 + layout6 diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index da705359..d92f9467 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -21,7 +21,7 @@ - tqlayout4 + layout4 @@ -56,7 +56,7 @@ - tqlayout3 + layout3 @@ -248,7 +248,7 @@ - tqlayout2 + layout2 @@ -328,7 +328,7 @@ - tqlayout8 + layout8 diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui index 20ad8628..6af82e16 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -92,7 +92,7 @@ - tqlayout2 + layout2 diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui index c40df6e2..e5a23692 100644 --- a/kopete/kopete/config/appearance/emoticonseditwidget.ui +++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index 16026c84..8a2021fd 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -59,7 +59,7 @@ - tqlayout5 + layout5 @@ -89,7 +89,7 @@ - tqlayout4 + layout4 @@ -114,7 +114,7 @@ - tqlayout1 + layout1 diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui index f8a26c86..d9fa4e4f 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui +++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui @@ -198,7 +198,7 @@ - tqlayout11 + layout11 @@ -206,7 +206,7 @@ - tqlayout9 + layout9 @@ -296,7 +296,7 @@ - tqlayout10 + layout10 @@ -448,7 +448,7 @@ - tqlayout8 + layout8 @@ -536,7 +536,7 @@ - tqlayout19 + layout19 diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui index f2394f16..a2a40598 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui @@ -182,7 +182,7 @@ - tqlayout3 + layout3 @@ -231,7 +231,7 @@ - tqlayout4 + layout4 diff --git a/kopete/kopete/config/behavior/behaviorconfig_events.ui b/kopete/kopete/config/behavior/behaviorconfig_events.ui index 748d519f..9a3fe302 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_events.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_events.ui @@ -46,7 +46,7 @@ - tqlayout11_2 + layout11_2 @@ -104,7 +104,7 @@ - tqlayout11 + layout11 @@ -148,7 +148,7 @@ - tqlayout7 + layout7 diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui index 48680e64..c35aa4d5 100644 --- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui +++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui @@ -111,7 +111,7 @@ - tqlayout3 + layout3 @@ -226,7 +226,7 @@ - tqlayout3 + layout3 diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui index a216ec68..08272e07 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui +++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui @@ -27,7 +27,7 @@ - tqlayout6 + layout6 @@ -61,7 +61,7 @@ - tqlayout7 + layout7 @@ -138,7 +138,7 @@ - tqlayout12 + layout12 @@ -242,7 +242,7 @@ - tqlayout7 + layout7 @@ -316,7 +316,7 @@ - tqlayout11 + layout11 @@ -424,7 +424,7 @@ - tqlayout7 + layout7 diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index afd59013..45f15dad 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -18,7 +18,7 @@ - tqlayout13 + layout13 @@ -47,7 +47,7 @@ - tqlayout12 + layout12 diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index bc8c78f1..fa147a52 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -135,7 +135,7 @@ - tqlayout3 + layout3 diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index 515ac5ab..6e13abba 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -36,7 +36,7 @@ - tqlayout7 + layout7 diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index b86ba2ba..0c66892c 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -157,10 +157,10 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare mNotificationProps = new CustomNotificationProps( this, lvi->metaContact() ); // add a button to the notification props to get the sound from KABC - // the widget's vert box tqlayout, horiz box tqlayout containing button, spacer, followed by a spacer - TQBoxLayout * vb = static_cast( mNotificationProps->widget()->tqlayout() ); + // the widget's vert box layout, horiz box layout containing button, spacer, followed by a spacer + TQBoxLayout * vb = static_cast( mNotificationProps->widget()->layout() ); - TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABCtqlayout" ); + TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABClayout" ); mFromKABC = new TQPushButton( i18n( "Sync KABC..." ), mNotificationProps->widget(), "getSoundFromKABC" ); hb->addWidget( mFromKABC ); // [ [Button] <-xxxxx-> ] hb->addStretch(); diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index 831365b7..718a3ae9 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -60,7 +60,7 @@ - tqlayout8 + layout8 @@ -136,7 +136,7 @@ - tqlayout11 + layout11 @@ -187,7 +187,7 @@ - tqlayout12 + layout12 @@ -277,7 +277,7 @@ - tqlayout13 + layout13 @@ -328,7 +328,7 @@ - tqlayout7 + layout7 diff --git a/kopete/kopete/groupkabcselectorwidget.ui b/kopete/kopete/groupkabcselectorwidget.ui index 46d6c5e3..d4d6d5cf 100644 --- a/kopete/kopete/groupkabcselectorwidget.ui +++ b/kopete/kopete/groupkabcselectorwidget.ui @@ -35,7 +35,7 @@ - tqlayout13 + layout13 diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp index ae50ae98..4e0daa55 100644 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp @@ -46,8 +46,8 @@ TQString cryptStr(const TQString &aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index 89b4f919..e361abf6 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -193,7 +193,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) { // The Unicode chars E000-F800 are non-printable and reserved for // private use in applications. For more details, see also - // http://www.tqunicode.org/charts/PDF/UE000.pdf. + // http://www.unicode.org/charts/PDF/UE000.pdf. // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 8fc4c46f..f9fb6e59 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -21,7 +21,7 @@ - tqlayout9 + layout9 diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index 4c3993e0..423b2047 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -128,7 +128,7 @@ - tqlayout1 + layout1 diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 4408d23b..f29756e8 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -30,7 +30,7 @@ - tqlayout2 + layout2 @@ -98,7 +98,7 @@ - tqlayout19 + layout19 @@ -135,7 +135,7 @@ Leave it empty if you want to see the contact nickname as display name. - tqlayout6 + layout6 @@ -183,7 +183,7 @@ Leave it empty if you want to see the contact nickname as display name. - tqlayout11 + layout11 diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 42c01981..7e783024 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree ) setRootIsDecorated( false ); setTreeStepSize( 0 ); } - // TODO: retqlayout all items. their width may have changed, but they won't know about it. + // TODO: relayout all items. their width may have changed, but they won't know about it. } /* This is a small hack ensuring that only F2 triggers inline diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 5c4ff318..03616908 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -236,7 +236,7 @@ bool Component::setMinHeight( int height ) return true; } -void Component::tqlayout( const TQRect &newRect ) +void Component::layout( const TQRect &newRect ) { if ( rect().isNull() ) d->startRect = TQRect( newRect.topLeft(), newRect.topLeft() ); @@ -267,21 +267,21 @@ void Component::repaint() d->parent->repaint(); } -void Component::retqlayout() +void Component::relayout() { - d->parent->retqlayout(); + d->parent->relayout(); } void Component::componentAdded( Component *component ) { ComponentBase::componentAdded( component ); - //update( Retqlayout ); + //update( Relayout ); } void Component::componentRemoved( Component *component ) { ComponentBase::componentRemoved( component ); - //update( Retqlayout ); + //update( Relayout ); } // BoxComponent -------- @@ -376,12 +376,12 @@ void BoxComponent::calcMinSize() if ( sizeChanged ) repaint(); else - retqlayout(); + relayout(); } -void BoxComponent::tqlayout( const TQRect &rect ) +void BoxComponent::layout( const TQRect &rect ) { - Component::tqlayout( rect ); + Component::layout( rect ); bool horiz = (d->direction ==Qt::Horizontal); int fixedSize = 0; @@ -437,7 +437,7 @@ void BoxComponent::tqlayout( const TQRect &rect ) pos += rc.height(); remaining -= rc.height() - minHeight; } - comp->tqlayout( rc & rect ); + comp->layout( rc & rect ); pos += padding; } } @@ -518,7 +518,7 @@ void ContactBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void ContactBoxComponent::tqlayout(const TQRect &rect) +void ContactBoxComponent::layout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -529,8 +529,8 @@ void ContactBoxComponent::tqlayout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::tqlayout(d->sub); - Component::tqlayout(rect); + BoxComponent::layout(d->sub); + Component::layout(rect); } int ContactBoxComponent::widthForHeight(int height) @@ -661,7 +661,7 @@ void GroupBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void GroupBoxComponent::tqlayout(const TQRect &rect) +void GroupBoxComponent::layout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -672,8 +672,8 @@ void GroupBoxComponent::tqlayout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::tqlayout(d->sub); - Component::tqlayout(rect); + BoxComponent::layout(d->sub); + Component::layout(rect); } int GroupBoxComponent::widthForHeight(int height) @@ -881,7 +881,7 @@ void TextComponent::setText( const TQString &text ) { if ( text == d->text ) return; d->text = text; - retqlayout(); + relayout(); calcMinSize(); } @@ -968,9 +968,9 @@ DisplayNameComponent::~DisplayNameComponent() delete d; } -void DisplayNameComponent::tqlayout( const TQRect &rect ) +void DisplayNameComponent::layout( const TQRect &rect ) { - Component::tqlayout( rect ); + Component::layout( rect ); // finally, lay everything out TQRect rc; @@ -989,7 +989,7 @@ void DisplayNameComponent::tqlayout( const TQRect &rect ) if ( comp->rtti() == Rtti_TextComponent ) { comp->show(); - comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), totalWidth - usedWidth, comp->heightForWidth( totalWidth - usedWidth ) ) ); } else { @@ -999,7 +999,7 @@ void DisplayNameComponent::tqlayout( const TQRect &rect ) else { comp->show(); - comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), comp->widthForHeight( rect.height() ), comp->heightForWidth( rect.width() ) ) ); } @@ -1316,13 +1316,13 @@ void Item::initLVI() void Item::slotColumnResized() { scheduleLayout(); - // if we've been resized, don't animate the tqlayout + // if we've been resized, don't animate the layout d->animateLayout = false; } void Item::scheduleLayout() { - // perform a delayed tqlayout in order to speed it all up + // perform a delayed layout in order to speed it all up if ( ! d->layoutTimer.isActive() ) d->layoutTimer.start( 30, true ); } @@ -1341,7 +1341,7 @@ void Item::slotLayoutItems() } int height = component( n )->heightForWidth( width ); - component( n )->tqlayout( TQRect( 0, 0, width, height ) ); + component( n )->layout( TQRect( 0, 0, width, height ) ); //kdDebug(14000) << k_funcinfo << "Component " << n << " is " << width << " x " << height << endl; } @@ -1456,13 +1456,13 @@ void Item::slotUpdateVisibility() void Item::repaint() { - // if we're about to retqlayout, don't bother painting yet. + // if we're about to relayout, don't bother painting yet. if ( d->layoutTimer.isActive() ) return; listView()->repaintItem( this ); } -void Item::retqlayout() +void Item::relayout() { scheduleLayout(); } @@ -1540,7 +1540,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, + lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); @@ -1565,7 +1565,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index ba4b86f7..bd2a2968 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -45,8 +45,8 @@ public: /** Repaint this item */ virtual void repaint() = 0; - /** Retqlayout this item */ - virtual void retqlayout() = 0; + /** Relayout this item */ + virtual void relayout() = 0; /** * Get the tool tip string and rectangle for a tip request at position @@ -112,7 +112,7 @@ public: * @param rect the new rectangle this component will paint in, relative to the painter * passed to the paint() function by the parent item. */ - virtual void tqlayout( const TQRect &rect ); + virtual void layout( const TQRect &rect ); /** * Paint this item, inside the rectangle returned by rect(). @@ -121,7 +121,7 @@ public: virtual void paint( TQPainter *painter, const TQColorGroup &cg ); void repaint(); - void retqlayout(); + void relayout(); /** * @return the rect this component was allocated last time it was laid out @@ -196,19 +196,19 @@ public: protected: /** * Change the minimum width, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your tqlayout() function. + * to be at all useful. Note: do not call this from your layout() function. * @param width the minimum width * @return true if the size has actually changed, false if it's been set to - * the existing values. if it returns true, you do not need to retqlayout, + * the existing values. if it returns true, you do not need to relayout, * since the parent component will do that for you. */ bool setMinWidth( int width ); /** * Change the minimum height, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your tqlayout() function. + * to be at all useful. Note: do not call this from your layout() function. * @param height the minimum height * @return true if the size has actually changed, false if it's been set to - * the existing values. If it returns true, you do not need to retqlayout, + * the existing values. If it returns true, you do not need to relayout, * since the parent component will do that for you. */ bool setMinHeight( int height ); @@ -236,7 +236,7 @@ public: BoxComponent( ComponentBase *parent, Direction dir =Horizontal ); ~BoxComponent(); - virtual void tqlayout( const TQRect &rect ); + virtual void layout( const TQRect &rect ); virtual int widthForHeight( int height ); virtual int heightForWidth( int width ); @@ -267,7 +267,7 @@ public: virtual void reloadTheme(); - virtual void tqlayout(const TQRect &rect); + virtual void layout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -290,7 +290,7 @@ public: virtual void reloadTheme(); - virtual void tqlayout(const TQRect &rect); + virtual void layout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -406,7 +406,7 @@ public: * Dtor */ ~DisplayNameComponent(); - void tqlayout( const TQRect& rect ); + void layout( const TQRect& rect ); TQString text(); void setText( const TQString& text ); @@ -461,7 +461,7 @@ public: ~Item(); void repaint(); - void retqlayout(); + void relayout(); void setup(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 8a5663b6..ac510361 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -19,7 +19,7 @@ - tqlayout3 + layout3 @@ -50,7 +50,7 @@ - tqlayout2 + layout2 diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index 52d946b9..4ff402b1 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -42,7 +42,7 @@ - tqlayout2 + layout2 diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui index e31ef3e4..3694784a 100644 --- a/kopete/plugins/autoreplace/autoreplaceprefs.ui +++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui @@ -91,7 +91,7 @@ - tqlayout5 + layout5 @@ -157,7 +157,7 @@ - tqlayout1 + layout1 diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 7138396c..4d39a0ca 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -137,7 +137,7 @@ - tqlayout3 + layout3 @@ -217,7 +217,7 @@ - tqlayout4 + layout4 @@ -288,7 +288,7 @@ - tqlayout5 + layout5 @@ -339,7 +339,7 @@ - tqlayout6 + layout6 @@ -390,7 +390,7 @@ - tqlayout7 + layout7 @@ -413,7 +413,7 @@ - tqlayout8 + layout8 diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index b31118ec..09c349f1 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -597,16 +597,16 @@ void HistoryDialog::slotCopy() if ( qsSelection.isEmpty() ) return; disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Selection); + TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } void HistoryDialog::slotCopyURL() { disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::tqclipboard()->setText( mURL, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText( mURL, TQClipboard::Selection); + TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard); + TQApplication::clipboard()->setText( mURL, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index 35891bf9..8d7ca4b2 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 @@ -64,7 +64,7 @@ - tqlayout8 + layout8 @@ -136,7 +136,7 @@ - tqlayout5 + layout5 @@ -253,7 +253,7 @@ - tqlayout11 + layout11 diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui index 365e159b..2d036a3c 100644 --- a/kopete/plugins/latex/latexprefsbase.ui +++ b/kopete/plugins/latex/latexprefsbase.ui @@ -59,7 +59,7 @@ - tqlayout1 + layout1 @@ -94,7 +94,7 @@ - tqlayout2 + layout2 diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui index f673ccb7..f8fd22c7 100644 --- a/kopete/plugins/motionautoaway/motionawayprefs.ui +++ b/kopete/plugins/motionautoaway/motionawayprefs.ui @@ -60,7 +60,7 @@ - tqlayout21 + layout21 @@ -136,7 +136,7 @@ - tqlayout5 + layout5 @@ -174,7 +174,7 @@ - tqlayout6 + layout6 @@ -212,7 +212,7 @@ - tqlayout16 + layout16 diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui index 57c5943b..0c0838fb 100644 --- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui +++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui @@ -46,7 +46,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger - tqlayout1 + layout1 diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index 474c448a..125ff80b 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -64,7 +64,7 @@ - tqlayout4 + layout4 @@ -92,7 +92,7 @@ Expressions in brackets depend on a substitution being made. - tqlayout2 + layout2 @@ -281,7 +281,7 @@ in place of your status message. - tqlayout2_2 + layout2_2 diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index f8be184a..efe7ede5 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -37,7 +37,7 @@ - tqlayout4 + layout4 diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui index 7c88f07f..e10c3c3a 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationui.ui +++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui @@ -60,7 +60,7 @@ - tqlayout14 + layout14 diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index b0f6ea27..4c53d8e2 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -52,7 +52,7 @@ - tqlayout11 + layout11 @@ -77,7 +77,7 @@ - tqlayout9 + layout9 @@ -98,7 +98,7 @@ - tqlayout7 + layout7 @@ -172,7 +172,7 @@ - tqlayout5 + layout5 diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 20f3ed03..64febcaa 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -17,7 +17,7 @@ * * ************************************************************************* Patched by Francesco Rossi in order to support new - google translation page tqlayout (13-sept-2007) + google translation page layout (13-sept-2007) */ #include diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index 5c6632d8..0a676973 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -159,7 +159,7 @@ Note that some web browsers do not support XHTML. You should also make sure your - tqlayout1 + layout1 @@ -260,7 +260,7 @@ images/winpopup_protocol.png - tqlayout2 + layout2 diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index 48279c5d..e51209c6 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -18,7 +18,7 @@ - tqlayout39 + layout39 @@ -84,7 +84,7 @@ - tqlayout10 + layout10 @@ -92,7 +92,7 @@ - tqlayout8 + layout8 @@ -223,7 +223,7 @@ - tqlayout9 + layout9 diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui index 07b531f0..70600eb1 100644 --- a/kopete/protocols/gadu/ui/gaduawayui.ui +++ b/kopete/protocols/gadu/ui/gaduawayui.ui @@ -33,7 +33,7 @@ - tqlayout3 + layout3 @@ -57,7 +57,7 @@ Choosing Offline status will disconnect you, with given description. - tqlayout2 + layout2 @@ -137,7 +137,7 @@ Choosing Offline status will disconnect you, with given description. - tqlayout278 + layout278 diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 8707f8db..79722aa0 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -58,7 +58,7 @@ - tqlayout8 + layout8 @@ -265,7 +265,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout65 + layout65 @@ -413,7 +413,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout9 + layout9 @@ -421,7 +421,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout8 + layout8 @@ -479,7 +479,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout7 + layout7 @@ -579,7 +579,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout12 + layout12 @@ -587,7 +587,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout11 + layout11 @@ -613,7 +613,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout10 + layout10 @@ -686,7 +686,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout33 + layout33 @@ -694,7 +694,7 @@ If you do not currently have an account, please click the button to create one.< - tqlayout32 + layout32 diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index 8099b0d9..fcb5b1c3 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -21,7 +21,7 @@ - tqlayout33 + layout33 diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index 3ed367d4..e747e952 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -50,7 +50,7 @@ - tqlayout38 + layout38 @@ -58,7 +58,7 @@ - tqlayout36 + layout36 @@ -66,7 +66,7 @@ - tqlayout31 + layout31 @@ -74,7 +74,7 @@ - tqlayout29 + layout29 @@ -116,7 +116,7 @@ - tqlayout30 + layout30 @@ -148,7 +148,7 @@ - tqlayout34 + layout34 @@ -231,7 +231,7 @@ - tqlayout32 + layout32 @@ -282,7 +282,7 @@ - tqlayout37 + layout37 @@ -290,7 +290,7 @@ - tqlayout33 + layout33 @@ -343,7 +343,7 @@ - tqlayout35 + layout35 diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index fc7fff68..25be8093 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 539698ec..68a31fb4 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -254,7 +254,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) } index += bytesEncoded; escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h index ea3a2626..d1b2486c 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h @@ -108,7 +108,7 @@ class Transfer; * any of three ways - * ascii text, * latin1 as hexadecimal, - * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) + * escaped unicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the unicode value and the ? ) * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server * */ diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index bfcf732f..49d1d9dd 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -50,7 +50,7 @@ class EventTransfer; All Events contain an event code, and a source ( a DN ) NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server NONE indicates there is no further data - STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length. + STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length. FLAGS contains a UINT32 containing the server's flags for this conference. See gwerror.h for the possible values and meanings of these flags. Only Logging has been observed in practice. All events are timestamped with the local time on receipt. diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 2c7f3615..a3c82b51 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -248,7 +248,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) m_packetState = ProtocolError; break; } - // convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val. + // convert to unicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val. TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 ); debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) ); // create singlefield diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index 646116e6..40917ccf 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -53,7 +53,7 @@ - tqlayout1 + layout1 @@ -121,7 +121,7 @@ - tqlayout66 + layout66 diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index 726376a5..c4f9a9c6 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -29,7 +29,7 @@ - tqlayout16 + layout16 @@ -341,7 +341,7 @@ - tqlayout15 + layout15 diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index 8f7a3b65..1899a525 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -65,7 +65,7 @@ - tqlayout2 + layout2 diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 4a7575e2..3b4670a0 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy() kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; if ( m_propsWidget->m_propsView->currentItem() ) { - TQClipboard *cb = kapp->tqclipboard(); + TQClipboard *cb = kapp->clipboard(); cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) ); } } diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index b4d70037..95481add 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -48,7 +48,7 @@ - tqlayout15 + layout15 diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 9847a23c..3713e31b 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -21,7 +21,7 @@ - tqlayout13 + layout13 @@ -255,7 +255,7 @@ - tqlayout12 + layout12 @@ -318,7 +318,7 @@ - tqlayout8 + layout8 diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 9c486269..0e81a783 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 7afcd487..0c3efcac 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -54,7 +54,7 @@ - tqlayout2 + layout2 diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 0fa2cd65..60fb63db 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -26,7 +26,7 @@ - tqlayout11 + layout11 @@ -34,7 +34,7 @@ - tqlayout9 + layout9 @@ -60,7 +60,7 @@ - tqlayout8 + layout8 @@ -153,7 +153,7 @@ - tqlayout10 + layout10 diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 7de10328..2027c579 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -21,7 +21,7 @@ - tqlayout13 + layout13 @@ -88,7 +88,7 @@ - tqlayout14 + layout14 diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 622ad995..d7ef0279 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -118,7 +118,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, + lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); @@ -143,7 +143,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, @@ -170,21 +170,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) { ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout"); - tqlayout72_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout72_2"); + layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2"); textLabel1_2 = new TQLabel( this, "textLabel1_2" ); - tqlayout72_2->addWidget( textLabel1_2 ); + layout72_2->addWidget( textLabel1_2 ); channelSearch = new TQLineEdit( this, "channelSearch" ); - tqlayout72_2->addWidget( channelSearch ); + layout72_2->addWidget( channelSearch ); numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" ); numUsers->setSuffix( i18n(" members") ); - tqlayout72_2->addWidget( numUsers ); + layout72_2->addWidget( numUsers ); mSearchButton = new TQPushButton( this, "mSearchButton" ); - tqlayout72_2->addWidget( mSearchButton ); - ChannelListLayout->addLayout( tqlayout72_2 ); + layout72_2->addWidget( mSearchButton ); + ChannelListLayout->addLayout( layout72_2 ); mChannelList = new KListView( this, "mChannelList" ); mChannelList->addColumn( i18n( "Channel" ) ); diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index 81c56e1c..1a528bb9 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -69,7 +69,7 @@ class ChannelList TQPushButton* mSearchButton; KListView* mChannelList; TQVBoxLayout* ChannelListLayout; - TQHBoxLayout* tqlayout72_2; + TQHBoxLayout* layout72_2; KIRC::Engine *m_engine; bool mSearching; TQString mSearch; diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index 3c417075..a85681cd 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -45,7 +45,7 @@ - tqlayout70 + layout70 diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index f04c8e09..c184b92e 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -261,7 +261,7 @@ - tqlayout21 + layout21 @@ -269,7 +269,7 @@ - tqlayout19 + layout19 @@ -304,7 +304,7 @@ - tqlayout20 + layout20 @@ -395,7 +395,7 @@ - tqlayout25 + layout25 @@ -554,7 +554,7 @@ - tqlayout19 + layout19 @@ -646,7 +646,7 @@ - tqlayout23 + layout23 @@ -809,7 +809,7 @@ - tqlayout153 + layout153 @@ -886,7 +886,7 @@ - tqlayout29 + layout29 diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 3809bcfa..3344f802 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -31,7 +31,7 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * emptyForm = privForm; - /* Add instructions to tqlayout. */ + /* Add instructions to layout. */ TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4); TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel"); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui index 3ae2edc1..bea1ac4e 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui @@ -21,7 +21,7 @@ - tqlayout8 + layout8 @@ -29,7 +29,7 @@ - tqlayout5 + layout5 @@ -81,7 +81,7 @@ - tqlayout4 + layout4 @@ -147,7 +147,7 @@ - tqlayout7 + layout7 @@ -232,7 +232,7 @@ - tqlayout1 + layout1 @@ -309,7 +309,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc index 8456a90f..f3244c54 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc @@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) { sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr)); } -void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) { - play_ = ptqlayout; +void LinphoneMediaChannel::SetPlayout(bool playout) { + play_ = playout; } void LinphoneMediaChannel::SetSend(bool send) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h index 2639c7ac..0c00be75 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h @@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel { virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPtqlayout(bool ptqlayout); + virtual void SetPlayout(bool playout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h index 4a2e4560..db2f9654 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h @@ -41,7 +41,7 @@ class MediaChannel { void SetInterface(NetworkInterface *iface) {network_interface_ = iface;} virtual void SetCodec(const char *codec) = 0; virtual void OnPacketReceived(const void *data, int len) = 0; - virtual void SetPtqlayout(bool ptqlayout) = 0; + virtual void SetPlayout(bool playout) = 0; virtual void SetSend(bool send) = 0; virtual float GetCurrentQuality() = 0; virtual int GetOutputLevel() = 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc index 90092283..24036b02 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len) } } -void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) +void PortAudioMediaChannel::SetPlayout(bool playout) { if (!stream_) return; - if (play_ && !ptqlayout) { + if (play_ && !playout) { int err = Pa_StopStream(stream_); if (err != paNoError) { fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err)); @@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) } play_ = false; } - else if (!play_ && ptqlayout) { + else if (!play_ && playout) { int err = Pa_StartStream(stream_); if (err != paNoError) { fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err)); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h index 89922e77..95c39a1a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h @@ -15,7 +15,7 @@ public: virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPtqlayout(bool ptqlayout); + virtual void SetPlayout(bool playout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc index c55ef287..58e1db60 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc @@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) { void VoiceChannel::ChangeState() { if (paused_ || !enabled_ || !socket_writable_) { - channel_->SetPtqlayout(false); + channel_->SetPlayout(false); channel_->SetSend(false); } else { if (muted_) { channel_->SetSend(false); - channel_->SetPtqlayout(true); + channel_->SetPlayout(true); } else { channel_->SetSend(true); - channel_->SetPtqlayout(true); + channel_->SetPlayout(true); } } } diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index ee258105..30a609a0 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -27,7 +27,7 @@ - tqlayout24 + layout24 diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index 5c588e57..f5f40392 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -57,7 +57,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index d85feff8..b158db62 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -21,7 +21,7 @@ - tqlayout4 + layout4 @@ -97,7 +97,7 @@ - tqlayout5 + layout5 diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index d130fa97..be558388 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm () // translate the form and create it inside the display widget translator = new JabberFormTranslator (task->form (), dynamicForm); - dynamicForm->tqlayout()->add( translator ); + dynamicForm->layout()->add( translator ); translator->show(); // enable the send button diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 71400791..e0a14f1c 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -57,7 +57,7 @@ - tqlayout61 + layout61 @@ -312,7 +312,7 @@ - tqlayout66 + layout66 @@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co - tqlayout70 + layout70 @@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co - tqlayout68 + layout68 @@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co - tqlayout10 + layout10 @@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co - tqlayout9 + layout9 diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 7b39edeb..ff324085 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -59,7 +59,7 @@ void dlgJabberRegister::slotGotForm () // translate the form and create it inside the box widget translator = new JabberFormTranslator (task->form (), grpForm); - static_cast(grpForm->tqlayout())->insertWidget(1, translator); + static_cast(grpForm->layout())->insertWidget(1, translator); translator->show(); resize(sizeHint()); diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index e34c208b..ea3d51c0 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -247,7 +247,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 8eb13e45..eaaf5aa6 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -21,7 +21,7 @@ - tqlayout4 + layout4 @@ -102,7 +102,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index d0d0a6bb..da690a97 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -112,7 +112,7 @@ - tqlayout1 + layout1 diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index ce06ba0a..6daa3a4e 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -33,7 +33,7 @@ - tqlayout13 + layout13 @@ -64,7 +64,7 @@ - tqlayout12 + layout12 @@ -159,7 +159,7 @@ - tqlayout14 + layout14 @@ -190,7 +190,7 @@ - tqlayout11 + layout11 @@ -221,7 +221,7 @@ - tqlayout10 + layout10 @@ -255,7 +255,7 @@ - tqlayout9 + layout9 @@ -427,7 +427,7 @@ - tqlayout36 + layout36 @@ -625,7 +625,7 @@ - tqlayout37 + layout37 @@ -823,7 +823,7 @@ - tqlayout57 + layout57 @@ -915,7 +915,7 @@ - tqlayout59 + layout59 diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index bdfea37f..170f5b90 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -27,7 +27,7 @@ - tqlayout53 + layout53 diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index c415b062..914d1533 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -47,7 +47,7 @@ - tqlayout81 + layout81 @@ -127,7 +127,7 @@ - tqlayout21 + layout21 @@ -135,7 +135,7 @@ - tqlayout56 + layout56 @@ -173,7 +173,7 @@ - tqlayout57 + layout57 @@ -241,7 +241,7 @@ - tqlayout17 + layout17 @@ -271,7 +271,7 @@ - tqlayout13 + layout13 diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index a0c37920..13817584 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -137,7 +137,7 @@ - tqlayout18 + layout18 diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index b8f852e3..e098e27b 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -762,7 +762,7 @@ TQString MSNSocket::escape( const TQString &str ) for ( int i = 0; i < old_length; i++ ) { - unsigned short character = str[i].tqunicode(); + unsigned short character = str[i].unicode(); if( character <= 32 || character == '%' ) { diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index 3bf74195..fab496d3 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -24,7 +24,7 @@ - tqlayout21 + layout21 diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index 9c453e7c..0a764c57 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -128,7 +128,7 @@ - tqlayout14 + layout14 @@ -265,7 +265,7 @@ - tqlayout13_2 + layout13_2 @@ -408,7 +408,7 @@ Only works for emoticons in the PNG format. - tqlayout28 + layout28 @@ -641,7 +641,7 @@ Only works for emoticons in the PNG format. - tqlayout17 + layout17 @@ -679,7 +679,7 @@ Only works for emoticons in the PNG format. - tqlayout13 + layout13 @@ -736,7 +736,7 @@ Only works for emoticons in the PNG format. - tqlayout16 + layout16 @@ -865,7 +865,7 @@ Only works for emoticons in the PNG format. - tqlayout6 + layout6 @@ -889,7 +889,7 @@ Only works for emoticons in the PNG format. - tqlayout4 + layout4 @@ -950,7 +950,7 @@ Only works for emoticons in the PNG format. - tqlayout58 + layout58 @@ -1005,7 +1005,7 @@ Only works for emoticons in the PNG format. - tqlayout59 + layout59 @@ -1124,7 +1124,7 @@ Only works for emoticons in the PNG format. - tqlayout20 + layout20 @@ -1132,7 +1132,7 @@ Only works for emoticons in the PNG format. - tqlayout19 + layout19 @@ -1236,7 +1236,7 @@ Only check this option if the normal connection doesn't work. - tqlayout22 + layout22 diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui index fde773a2..59d50be6 100644 --- a/kopete/protocols/msn/ui/msninfo.ui +++ b/kopete/protocols/msn/ui/msninfo.ui @@ -98,7 +98,7 @@ - tqlayout3 + layout3 diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 87450fc8..c2ec9844 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -72,7 +72,7 @@ - tqlayout4 + layout4 @@ -242,7 +242,7 @@ - tqlayout58 + layout58 diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 125c711b..188e4aad 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -29,7 +29,7 @@ - tqlayout9 + layout9 @@ -92,7 +92,7 @@ - tqlayout10 + layout10 @@ -134,7 +134,7 @@ - tqlayout11 + layout11 diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index 6ae1f092..9ee07372 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -24,7 +24,7 @@ - tqlayout3 + layout3 @@ -47,7 +47,7 @@ - tqlayout4 + layout4 diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index 370bef8b..5296c154 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -21,7 +21,7 @@ - tqlayout22 + layout22 @@ -52,7 +52,7 @@ - tqlayout23 + layout23 @@ -150,7 +150,7 @@ - tqlayout24 + layout24 diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index b60974e7..bd9f2f8e 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -53,7 +53,7 @@ - tqlayout5 + layout5 diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index 596e6791..1b8cbfbc 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -379,8 +379,8 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) ) utfMessage=new unsigned char[length]; for(unsigned int l=0; lencoding() != 0) charset=0x0003; //send as ISO-8859-1 } -if(!codec && charset != 0x0002) // it's neither tqunicode nor did we find a codec so far! +if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec so far! { kdDebug(14151) << k_funcinfo << "Couldn't find suitable encoding for outgoing message, " << diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 9e941132..5c86903a 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -348,12 +348,12 @@ void GSMLib::disconnect() } -void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) +void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) { m_parent = parent; - m_layout = tqlayout; + m_layout = layout; TQWidget *configWidget = configureWidget(parent); - tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index c7be276f..8cccfe81 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -65,7 +65,7 @@ - tqlayout13 + layout13 diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 0871266c..b3b09f43 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -41,13 +41,13 @@ SMSClient::~SMSClient() { } -void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) +void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl; + kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; m_parent = parent; - m_layout = tqlayout; + m_layout = layout; TQWidget *configWidget = configureWidget(parent); - tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 1442878e..36e9f543 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -65,7 +65,7 @@ - tqlayout13 + layout13 diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 732fc119..0c7c6cad 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -73,16 +73,16 @@ void SMSSend::send(const Kopete::Message& msg) m_provider->send(msg); } -void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) +void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl; + kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; m_parent = parent; - m_layout = tqlayout; + m_layout = layout; // could end up being deleted twice?? delete prefWidget; prefWidget = new SMSSendPrefsUI(parent); - tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); + layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); prefWidget->program->setMode(KFile::Directory); diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index 823b13e2..c902d22d 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -65,7 +65,7 @@ - tqlayout12 + layout12 diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h index c5ea28ab..dc0493bb 100644 --- a/kopete/protocols/sms/smsservice.h +++ b/kopete/protocols/sms/smsservice.h @@ -46,10 +46,10 @@ public: /** * Called when the settings widget has a place to be. @param parent is the - * settings widget's parent and @param tqlayout is the 2xn grid tqlayout it may + * settings widget's parent and @param layout is the 2xn grid layout it may * use. */ - virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) = 0; + virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* layout) = 0; virtual void send(const Kopete::Message& msg) = 0; virtual int maxSize() = 0; diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index cd28df83..10f5c235 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -118,7 +118,7 @@ - tqlayout35 + layout35 @@ -236,7 +236,7 @@ - tqlayout119 + layout119 @@ -303,7 +303,7 @@ - tqlayout56 + layout56 diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui index e5efd52b..cc970bbc 100644 --- a/kopete/protocols/sms/ui/smsadd.ui +++ b/kopete/protocols/sms/ui/smsadd.ui @@ -32,7 +32,7 @@ - tqlayout35 + layout35 @@ -40,7 +40,7 @@ - tqlayout33 + layout33 @@ -84,7 +84,7 @@ - tqlayout34 + layout34 diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui index 5a182c52..aa719efe 100644 --- a/kopete/protocols/sms/ui/smsuserprefs.ui +++ b/kopete/protocols/sms/ui/smsuserprefs.ui @@ -56,7 +56,7 @@ - tqlayout11 + layout11 diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index d678c4f0..99500ddb 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -53,7 +53,7 @@ - tqlayout1_2 + layout1_2 diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui index e0b9202e..b9994322 100644 --- a/kopete/protocols/testbed/testbedaddui.ui +++ b/kopete/protocols/testbed/testbedaddui.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index fe0fab28..a594a5b1 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -28,7 +28,7 @@ - tqlayout59 + layout59 @@ -36,7 +36,7 @@ - tqlayout57 + layout57 @@ -80,7 +80,7 @@ - tqlayout58 + layout58 @@ -117,7 +117,7 @@ - tqlayout11 + layout11 diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index 5029190c..ecf97df5 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -64,7 +64,7 @@ - tqlayout40 + layout40 @@ -266,7 +266,7 @@ However, the recommended way is to ask your administrator to create this directo - tqlayout6 + layout6 @@ -274,7 +274,7 @@ However, the recommended way is to ask your administrator to create this directo - tqlayout5 + layout5 diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui index aaec0dbe..7c87b961 100644 --- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui +++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui @@ -26,7 +26,7 @@ - tqlayout6 + layout6 @@ -34,7 +34,7 @@ - tqlayout5 + layout5 @@ -120,7 +120,7 @@ - tqlayout4 + layout4 diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index 7faf0035..723f9904 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -27,7 +27,7 @@ - tqlayout53 + layout53 diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 97be5673..cc13584e 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -59,7 +59,7 @@ - tqlayout81 + layout81 @@ -250,7 +250,7 @@ - tqlayout58 + layout58 diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 056a93f4..63d7973e 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -21,7 +21,7 @@ - tqlayout19 + layout19 @@ -40,7 +40,7 @@ - tqlayout5 + layout5 @@ -74,7 +74,7 @@ - tqlayout4 + layout4 @@ -106,7 +106,7 @@ - tqlayout2 + layout2 @@ -131,7 +131,7 @@ - tqlayout10 + layout10 @@ -193,7 +193,7 @@ - tqlayout14 + layout14 @@ -233,7 +233,7 @@ - tqlayout18 + layout18 diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 351bcec4..bfaa80fb 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -32,7 +32,7 @@ - tqlayout0 + layout0 @@ -89,7 +89,7 @@ - tqlayout16 + layout16 diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index 8b07f036..5a11848d 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -57,9 +57,9 @@ namespace KPF view_->addColumn(i18n("Resource")); view_->addColumn(i18n("Host")); - TQVBoxLayout * tqlayout = new TQVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); - tqlayout->addWidget(view_); + layout->addWidget(view_); connect ( diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h index bd41962f..5b7e9e8c 100644 --- a/kpf/src/Applet.h +++ b/kpf/src/Applet.h @@ -93,13 +93,13 @@ namespace KPF /** * Called when a WebServer object has been created. Creates an - * AppletItem, associates it with the former, and updates the tqlayout. + * AppletItem, associates it with the former, and updates the layout. */ void slotServerCreated(WebServer *); /** * Called when a WebServer object has been disabled. - * Deletes the associated AppletItem and updates the tqlayout. + * Deletes the associated AppletItem and updates the layout. */ void slotServerDisabled(WebServer *); @@ -121,13 +121,13 @@ namespace KPF virtual void about(); /** - * Overridden to keep track of orientation change and update tqlayout + * Overridden to keep track of orientation change and update layout * accordingly. */ virtual void orientationChange(Qt::Orientation); /** - * Overridden to update tqlayout accordingly. + * Overridden to update layout accordingly. */ virtual void moveEvent(TQMoveEvent *); virtual void resizeEvent(TQResizeEvent *); @@ -138,7 +138,7 @@ namespace KPF virtual void mousePressEvent(TQMouseEvent *); /** - * Updates the tqlayout, moving AppletItem objects into proper positions. + * Updates the layout, moving AppletItem objects into proper positions. */ virtual void resetLayout(); diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp index 1fdf2c63..b7962b07 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -62,7 +62,7 @@ namespace KPF TQFrame * w = makeMainWidget(); - TQVBoxLayout * tqlayout = + TQVBoxLayout * layout = new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint()); TQLabel * info = @@ -84,9 +84,9 @@ namespace KPF w ); - tqlayout->addWidget(info); + layout->addWidget(info); - TQGridLayout * grid = new TQGridLayout(tqlayout, codeList.count(), 2); + TQGridLayout * grid = new TQGridLayout(layout, codeList.count(), 2); TQString pattern(i18n("%1 %2")); diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index 79ec90f1..3c2e78f9 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -171,59 +171,59 @@ namespace KPF sb_bandwidthLimit_ ->setSuffix(i18n(" kB/s")); // sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit); - TQVBoxLayout * tqlayout1 = + TQVBoxLayout * layout1 = new TQVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout2 = + TQVBoxLayout * layout2 = new TQVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout3 = + TQVBoxLayout * layout3 = new TQVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint()); -// TQVBoxLayout * tqlayout4 = +// TQVBoxLayout * layout4 = // new TQVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout5 = + TQVBoxLayout * layout5 = new TQVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout1->addWidget(l_rootDirectoryHelp); - tqlayout2->addWidget(l_listenPortHelp); - tqlayout3->addWidget(l_bandwidthLimitHelp); -// tqlayout4->addWidget(l_connectionLimitHelp); - tqlayout5->addWidget(l_serverNameHelp); + layout1->addWidget(l_rootDirectoryHelp); + layout2->addWidget(l_listenPortHelp); + layout3->addWidget(l_bandwidthLimitHelp); +// layout4->addWidget(l_connectionLimitHelp); + layout5->addWidget(l_serverNameHelp); - TQHBoxLayout * tqlayout10 = new TQHBoxLayout(tqlayout1); + TQHBoxLayout * layout10 = new TQHBoxLayout(layout1); - tqlayout10->addWidget(l_root_); - tqlayout10->addWidget(kur_root_); + layout10->addWidget(l_root_); + layout10->addWidget(kur_root_); - tqlayout1->addStretch(1); + layout1->addStretch(1); - TQHBoxLayout * tqlayout20 = new TQHBoxLayout(tqlayout2); + TQHBoxLayout * layout20 = new TQHBoxLayout(layout2); - tqlayout20->addWidget(l_listenPort_); - tqlayout20->addWidget(sb_listenPort_); + layout20->addWidget(l_listenPort_); + layout20->addWidget(sb_listenPort_); - tqlayout2->addStretch(1); + layout2->addStretch(1); - TQHBoxLayout * tqlayout30 = new TQHBoxLayout(tqlayout3); + TQHBoxLayout * layout30 = new TQHBoxLayout(layout3); - tqlayout30->addWidget(l_bandwidthLimit_); - tqlayout30->addWidget(sb_bandwidthLimit_); + layout30->addWidget(l_bandwidthLimit_); + layout30->addWidget(sb_bandwidthLimit_); - tqlayout3->addStretch(1); + layout3->addStretch(1); -// TQHBoxLayout * tqlayout40 = new TQHBoxLayout(tqlayout4); +// TQHBoxLayout * layout40 = new TQHBoxLayout(layout4); -// tqlayout40->addWidget(l_connectionLimit_); -// tqlayout40->addWidget(sb_connectionLimit_); +// layout40->addWidget(l_connectionLimit_); +// layout40->addWidget(sb_connectionLimit_); -// tqlayout4->addStretch(1); +// layout4->addStretch(1); - TQHBoxLayout * tqlayout50 = new TQHBoxLayout(tqlayout5); + TQHBoxLayout * layout50 = new TQHBoxLayout(layout5); - tqlayout50->addWidget(l_serverName_); - tqlayout50->addWidget(le_serverName_); + layout50->addWidget(l_serverName_); + layout50->addWidget(le_serverName_); addPage(page1_, i18n("Root Directory")); addPage(page2_, i18n("Listen Port")); diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp index 94709edc..79f4f487 100644 --- a/kpf/src/StartingKPFDialog.cpp +++ b/kpf/src/StartingKPFDialog.cpp @@ -71,9 +71,9 @@ namespace KPF mainWidget ); - TQVBoxLayout * tqlayout = new TQVBoxLayout(mainWidget); + TQVBoxLayout * layout = new TQVBoxLayout(mainWidget); - tqlayout->addWidget(about); + layout->addWidget(about); kapp->dcopClient()->setNotifications(true); diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 81e44459..740755e6 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -450,7 +450,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { l1->activate(); - // this activates the f-tqlayout and sets minimumSize() + // this activates the f-layout and sets minimumSize() f->show(); tl->addWidget(f); @@ -466,7 +466,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox); // TODO: activate if KGroupBox is fixed diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 8f2c8a89..2e6f2281 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -118,11 +118,11 @@ void ConWindow::accounting(bool on) { accountingEnabled = on; volumeAccountingEnabled = gpppdata.VolAcctEnabled(); - // delete old tqlayout + // delete old layout if(tl1 != 0) delete tl1; - // add tqlayout now + // add layout now tl1 = new TQVBoxLayout(this, 10, 10); tl1->addSpacing(5); TQHBoxLayout *tl = new TQHBoxLayout; diff --git a/kppp/edit.cpp b/kppp/edit.cpp index 19b78185..6e5b8553 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -892,7 +892,7 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam bbox->addStretch(1); remove = bbox->addButton(i18n("&Remove")); connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeButton())); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox); TQHBoxLayout *l12 = new TQHBoxLayout(0); diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 4d2d162c..4b78d330 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -515,7 +515,7 @@ void KPPPWidget::resetmodems() { } label7->setShown(m_bModemCShown); modem_c->setShown(m_bModemCShown); - tqlayout()->invalidate(); + layout()->invalidate(); setFixedSize(sizeHint()); //set the default modem @@ -1046,7 +1046,7 @@ void KPPPWidget::showNews() { dlg.connect(ok, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept())); bbox->addStretch(1); - bbox->tqlayout(); + bbox->layout(); l2->addWidget(l); l2->addWidget(cb); diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index fee59878..0844f85a 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -246,7 +246,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : this, TQT_SLOT(exportWizard())); bbox->addStretch(8); - bbox->tqlayout(); + bbox->layout(); currentMonth(); layoutWidget(); diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index db73149f..5417a1a2 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -79,11 +79,11 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name) setupToolbar(); - TQVBoxLayout *tqlayout=new TQVBoxLayout(this); - tqlayout->addWidget(menubar); - tqlayout->addWidget(toolbar); - tqlayout->addWidget(terminal); - tqlayout->addWidget(statusbar); + TQVBoxLayout *layout=new TQVBoxLayout(this); + layout->addWidget(menubar); + layout->addWidget(toolbar); + layout->addWidget(terminal); + layout->addWidget(statusbar); inittimer = new TQTimer(this); connect(inittimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(init())); diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 69103683..d641918f 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -55,7 +55,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) const int GRIDROWS = 22; int row = 0; - // toplevel tqlayout + // toplevel layout TQVBoxLayout *tl = new TQVBoxLayout(dummyWidget, 10, 4); // add grid + frame diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 6f910a69..4f9e521e 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -73,7 +73,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { ok->setDefault(true); ok->setEnabled(false); cancel = bbox->addButton(KStdGuiItem::cancel()); - bbox->tqlayout(); + bbox->layout(); tl->addWidget(bbox); setFixedSize(sizeHint()); diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp index 28cc9fc6..ba8508e5 100644 --- a/kppp/newwidget.cpp +++ b/kppp/newwidget.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// functions generating tqlayout-aware widgets +// functions generating layout-aware widgets // ///////////////////////////////////////////////////////////////////////////// diff --git a/kppp/newwidget.h b/kppp/newwidget.h index 07129c74..2cb2e717 100644 --- a/kppp/newwidget.h +++ b/kppp/newwidget.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// functions generating tqlayout-aware widgets +// functions generating layout-aware widgets // ///////////////////////////////////////////////////////////////////////////// diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index e27b583a..72cf1f49 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -95,7 +95,7 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel()); connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - bbox->tqlayout(); + bbox->layout(); l->addWidget(bbox); setFixedSize(sizeHint()); diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index a98a9390..fe73a1ad 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -249,7 +249,7 @@ void PPPL_ShowLog() { bbox->addStretch(1); TQPushButton *write = bbox->addButton(i18n("Write to File")); TQPushButton *close = bbox->addButton(KStdGuiItem::close()); - bbox->tqlayout(); + bbox->layout(); edit->setMinimumSize(600, 250); label->setMinimumSize(600, 15); diagnosis->setMinimumSize(600, 60); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 9a39746b..4a816121 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -144,7 +144,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, labela2[i]->setText(""); labelb2[i]->setText(""); - // add to tqlayout + // add to layout l112->addWidget(labela1[i], i, 0); l112->addWidget(labela2[i], i, 1); l112->addWidget(labelb1[i], i, 2); diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 870db69b..d7f60046 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -461,7 +461,7 @@ void urlEncode(TQString &s) { if(TQString(UNENCODED_CHARS).find(s[i]) >= 0) s1 += s[i]; else { - tmp.sprintf("%%%03i", s[i].tqunicode()); + tmp.sprintf("%%%03i", s[i].unicode()); s1 += tmp; } } diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index 087f7bd7..2d9f502b 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -50,10 +50,10 @@ KeyCaptureDialog::KeyCaptureDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Enter Key Combination" ), Cancel, Cancel, true), m_grabbed(false) { TQFrame *main = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( main, 0, KDialog::spacingHint() ); m_captureWidget = new KeyCaptureWidget( main, "m_captureWidget" ); - tqlayout->addWidget( m_captureWidget ); - tqlayout->addStretch(); + layout->addWidget( m_captureWidget ); + layout->addStretch(); } KeyCaptureDialog::~KeyCaptureDialog() { diff --git a/krdc/krdc.h b/krdc/krdc.h index a264e11e..9c8ed657 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -66,7 +66,7 @@ class KRDC : public TQWidget TQ_OBJECT private: SmartPtr m_progressDialog; // dialog, displayed while connecting - TQVBoxLayout *m_layout; // the tqlayout for autosizing the scrollview + TQVBoxLayout *m_layout; // the layout for autosizing the scrollview TQScrollView *m_scrollView; // scrollview that contains the remote widget KProgress *m_progress; // progress bar for the dialog KRemoteView *m_view; // the remote widget (e.g. KVncView) diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index ab302434..b244c6ff 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -80,7 +80,7 @@ void PreferencesDialog::load() m_rdpPrefs->setShowPrefs( m_rdpDefaults->askOnConnect() ); m_rdpPrefs->setUseKWallet( m_rdpDefaults->useKWallet() ); m_rdpPrefs->setColorDepth( m_rdpDefaults->colorDepth() ); - m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->tqlayout() )); + m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->layout() )); m_rdpPrefs->setResolution(); } diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index b91e42b1..14f5cabc 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -164,7 +164,7 @@ bool KRdpView::editPreferences( HostPrefPtr host ) int wv = hp->width(); int hv = hp->height(); int cd = hp->colorDepth(); - TQString kl = hp->tqlayout(); + TQString kl = hp->layout(); bool kwallet = hp->useKWallet(); // show preferences dialog @@ -243,7 +243,7 @@ bool KRdpView::start() *m_process << "-g" << (TQString::number(hp->width()) + "x" + TQString::number(hp->height())); } } - *m_process << "-k" << hp->tqlayout(); + *m_process << "-k" << hp->layout(); if(!m_user.isEmpty()) { *m_process << "-u" << m_user; } if(m_password.isEmpty() && useKWallet ) { diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp index 4f677aaf..ba876146 100644 --- a/krdc/rdp/rdphostpref.cpp +++ b/krdc/rdp/rdphostpref.cpp @@ -48,7 +48,7 @@ void RdpHostPref::save() m_config->writeEntry(p+"width", m_width); m_config->writeEntry(p+"height", m_height); m_config->writeEntry(p+"colorDepth", m_colorDepth); - m_config->writeEntry(p+"tqlayout", m_layout); + m_config->writeEntry(p+"layout", m_layout); m_config->writeEntry(p+"askOnConnect", m_askOnConnect); m_config->writeEntry(p+"useKWallet", m_useKWallet); } @@ -73,7 +73,7 @@ void RdpHostPref::load() m_width = m_config->readNumEntry(p+"width", 0); m_height = m_config->readNumEntry(p+"height", 0); m_colorDepth = m_config->readNumEntry(p+"colorDepth", 24); - m_layout = m_config->readEntry(p+"tqlayout", "en-us"); + m_layout = m_config->readEntry(p+"layout", "en-us"); m_askOnConnect = m_config->readBoolEntry(p+"askOnConnect", true); m_useKWallet = m_config->readBoolEntry(p+"useKWallet", true); } @@ -91,7 +91,7 @@ void RdpHostPref::remove() m_config->deleteEntry(p+"width"); m_config->deleteEntry(p+"height"); m_config->deleteEntry(p+"colorDepth"); - m_config->deleteEntry(p+"tqlayout"); + m_config->deleteEntry(p+"layout"); m_config->deleteEntry(p+"askOnConnect"); m_config->deleteEntry(p+"useKWallet"); } @@ -154,7 +154,7 @@ void RdpHostPref::setLayout(const TQString &l) save(); } -TQString RdpHostPref::tqlayout() const +TQString RdpHostPref::layout() const { return m_layout; } diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h index 11f490ec..7b7be704 100644 --- a/krdc/rdp/rdphostpref.h +++ b/krdc/rdp/rdphostpref.h @@ -60,29 +60,29 @@ static const int rdpDefaultKeymap = 6; // en-us inline int keymap2int(const TQString &keymap) { - int tqlayout; - for(tqlayout = 0; tqlayout < rdpNumKeymaps; tqlayout++) + int layout; + for(layout = 0; layout < rdpNumKeymaps; layout++) { - if(keymap == rdpKeymaps[tqlayout]) + if(keymap == rdpKeymaps[layout]) { break; } } - if(tqlayout == rdpNumKeymaps) + if(layout == rdpNumKeymaps) { - tqlayout = rdpDefaultKeymap; + layout = rdpDefaultKeymap; } - return tqlayout; + return layout; } -inline TQString int2keymap(int tqlayout) +inline TQString int2keymap(int layout) { - if(tqlayout < 0 || tqlayout >= rdpNumKeymaps) + if(layout < 0 || layout >= rdpNumKeymaps) { return rdpKeymaps[rdpDefaultKeymap]; } - return rdpKeymaps[tqlayout]; + return rdpKeymaps[layout]; } class RdpHostPref : public HostPref @@ -117,7 +117,7 @@ class RdpHostPref : public HostPref void setColorDepth(int depth); int colorDepth() const; void setLayout(const TQString &l); - TQString tqlayout() const; + TQString layout() const; void setAskOnConnect(bool ask); bool askOnConnect() const; bool useKWallet() const; diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index e22908c6..338dff73 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -338,7 +338,7 @@ 4 - Use this to specify your keyboard tqlayout. This tqlayout setting is used to send the correct keyboard codes to the server. + Use this to specify your keyboard layout. This layout setting is used to send the correct keyboard codes to the server. @@ -354,7 +354,7 @@ - &Keyboard tqlayout: + &Keyboard layout: cmbKbLayout diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index a5e42061..889a5783 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -92,7 +92,7 @@ KVncView::KVncView(TQWidget *parent, setFixedSize(16,16); setFocusPolicy(TQ_StrongFocus); - m_cb = TQApplication::tqclipboard(); + m_cb = TQApplication::clipboard(); connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index 8cb51ca2..e764036c 100644 --- a/krfb/krfb/invitation.cc +++ b/krfb/krfb/invitation.cc @@ -25,8 +25,8 @@ TQString cryptStr(const TQString &aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 411d3098..37ac10b5 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -361,7 +361,7 @@ RFBController::RFBController(Configuration *c) : connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents())); connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot())); - clipboard = TQApplication::tqclipboard(); + clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 3f9943c4..dae19a85 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -90,7 +90,7 @@ - tqlayout13 + layout13 @@ -98,7 +98,7 @@ - tqlayout9 + layout9 @@ -121,7 +121,7 @@ - tqlayout12 + layout12 @@ -147,7 +147,7 @@ - tqlayout11 + layout11 @@ -170,7 +170,7 @@ - tqlayout15 + layout15 @@ -201,7 +201,7 @@ - tqlayout12 + layout12 @@ -209,7 +209,7 @@ - tqlayout3 + layout3 @@ -235,7 +235,7 @@ - tqlayout9 + layout9 @@ -263,7 +263,7 @@ - tqlayout17 + layout17 diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index a44d9b2e..e793d755 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -566,7 +566,7 @@ - tqlayout12 + layout12 @@ -618,7 +618,7 @@ - tqlayout11 + layout11 @@ -683,7 +683,7 @@ - tqlayout10 + layout10 diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index 627c6ce4..5ea0dd9b 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -3,9 +3,9 @@ PageFont::PageFont( TQWidget *parent, const char *name ) : TQWidget( parent, name) { - tqlayout = new TQHBoxLayout(this); + layout = new TQHBoxLayout(this); fontchooser = new KFontChooser(this); - tqlayout->addWidget(fontchooser); + layout->addWidget(fontchooser); connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); } diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h index fcda96f2..0cc442d6 100644 --- a/ksirc/KSPrefs/page_font.h +++ b/ksirc/KSPrefs/page_font.h @@ -57,7 +57,7 @@ class PageFont : public TQWidget private: KFontChooser* fontchooser; /** The font choosing widget from kdelib */ - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; }; #endif diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index 2c31912f..839c0f59 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -357,7 +357,7 @@ - tqlayout2 + layout2 diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index 6dce178b..4d2fda54 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -22,7 +22,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcu m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); - globalGB->tqlayout()->add(m_key); + globalGB->layout()->add(m_key); } PageShortcuts::~PageShortcuts() diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 3dd44896..5927b498 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -131,7 +131,7 @@ void aHistLineEdit::slotMaybeResize() s.setHeight(h); resize(s); setFixedHeight( h ); - TQLayout *l = topLevelWidget()->tqlayout(); + TQLayout *l = topLevelWidget()->layout(); if(l){ l->invalidate(); l->activate(); @@ -352,7 +352,7 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e ) { if(e->button() == MidButton){ /* - * emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); + * emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection)); */ } else{ @@ -381,10 +381,10 @@ void aHistLineEdit::paste() { /* we let the top level take it */ if(ksopts->oneLineEntry) { - emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); + emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection)); } else { - TQString paste = TQApplication::tqclipboard()->text(TQClipboard::Selection); + TQString paste = TQApplication::clipboard()->text(TQClipboard::Selection); paste.replace("\n", " ~ "); insert(paste); } diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 60e27cdf..cf7a4581 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -27,7 +27,7 @@ aListBox::aListBox(TQWidget *parent, const char *name ) : TQListBox(parent,name) { clear(); - p_scroll = TQPalette(tqpalette()); + p_scroll = TQPalette(palette()); setAcceptDrops( true ); connect(this, TQT_SIGNAL(selected (const TQString&)), this, TQT_SIGNAL(selectedNick(const TQString&))); diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index 26b09ffd..5aafba1c 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -38,37 +38,37 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops())); toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices())); - tqlayout = new TQHBoxLayout(this); - tqlayout->setSpacing(0); - tqlayout->setMargin(0); + layout = new TQHBoxLayout(this); + layout->setSpacing(0); + layout->setMargin(0); protectButton = new TQPushButton(i18n("T"), this); protectButton->setToggleButton(true); makeSquare(protectButton); TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic")); connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode())); - tqlayout->addWidget(protectButton); + layout->addWidget(protectButton); outsideButton = new TQPushButton(i18n("N"), this); outsideButton->setToggleButton(true); makeSquare(outsideButton); TQToolTip::add(outsideButton, i18n("No outside messages")); connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode())); - tqlayout->addWidget(outsideButton); + layout->addWidget(outsideButton); moderateButton = new TQPushButton(i18n("M"), this); moderateButton->setToggleButton(true); makeSquare(moderateButton); TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak")); connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode())); - tqlayout->addWidget(moderateButton); + layout->addWidget(moderateButton); menuButton = new TQPushButton(i18n("..."), this); makeSquare(menuButton); menuButton->setFixedWidth(menuButton->width()*2); menuButton->setPopup(Popupmenu); TQToolTip::add(menuButton, i18n("More mode commands")); - tqlayout->addWidget(menuButton); + layout->addWidget(menuButton); } void chanButtons::invite() diff --git a/ksirc/chanButtons.h b/ksirc/chanButtons.h index ec5ebe9d..8e998bdf 100644 --- a/ksirc/chanButtons.h +++ b/ksirc/chanButtons.h @@ -48,7 +48,7 @@ class chanButtons : public TQWidget private: int toggleMenu[7]; - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; TQPushButton *protectButton; TQPushButton *moderateButton; TQPushButton *outsideButton; diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index 6392721f..32f2d670 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -417,7 +417,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) uint i; for(i = 0; i < nick.length();i++){ - switch(nick[0].tqunicode()){ + switch(nick[0].unicode()){ case '@': irc->setOp(TRUE); nick.remove(0,1); @@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) pmList.setAutoDelete(true); for(uint pos = 0; pos < modes.length(); pos++){ - switch(modes.at(pos).tqunicode()){ + switch(modes.at(pos).unicode()){ case '+': op = true; break; @@ -858,7 +858,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* * Look at the second character, it's uniq, check for +,- latter */ - if(mi->mode().tqunicode() == 'o'){ + if(mi->mode().unicode() == 'o'){ mode_o_plus = mi->op(); mode_o_minus = !mi->op(); diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index 5c88ccac..abac9198 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev ) void ColorBar::updateCellSize() { - setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); + setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); TQFontMetrics metrics( font() ); diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index c475f05c..542a28eb 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -101,7 +101,7 @@ - tqlayout2 + layout2 diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index 871c044d..fef6b27b 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -31,7 +31,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) : dccNewBase( parent, name) { - TQColorGroup cg_mainw = kapp->tqpalette().active(); + TQColorGroup cg_mainw = kapp->palette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index fce40055..8c6e9fef 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -141,7 +141,7 @@ - tqlayout1 + layout1 diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 65a9d725..7189a23a 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -645,7 +645,7 @@ bool Tokenizer::parseNextToken( Token &tok ) return false; tok.id = Token::Text; - tok.value = StringPtr( m_text.tqunicode() + idx, + tok.value = StringPtr( m_text.unicode() + idx, m_text.length() - idx ); tok.attributes.clear(); return true; @@ -658,7 +658,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { tok.id = Token::Text; tok.attributes.clear(); - tok.value = StringPtr( m_text.tqunicode(), + tok.value = StringPtr( m_text.unicode(), (*m_lastTag).index ); m_textBeforeFirstTagProcessed = true; @@ -676,7 +676,7 @@ bool Tokenizer::parseNextToken( Token &tok ) if ( lastType == TagIndex::Open && type == TagIndex::Close ) { - const TQChar *tagStart = m_text.tqunicode() + lastIndex + 1; + const TQChar *tagStart = m_text.unicode() + lastIndex + 1; uint tagLen = ( index - 1 ) - ( lastIndex + 1 ) + 1; // ? if ( *tagStart == '/' ) @@ -699,7 +699,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { tok.id = Token::Text; tok.attributes.clear(); - tok.value = StringPtr( m_text.tqunicode() + lastIndex + 1, + tok.value = StringPtr( m_text.unicode() + lastIndex + 1, ( index - 1 ) - lastIndex ); m_lastTag = it; @@ -715,7 +715,7 @@ bool Tokenizer::parseNextToken( Token &tok ) Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text ) { - const TQChar *start = text.tqunicode(); + const TQChar *start = text.unicode(); const TQChar *p = start; const TQChar *endP = p + text.length(); bool quoted = false; @@ -754,7 +754,7 @@ Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text ) void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags ) { - const TQChar *p = text.tqunicode(); + const TQChar *p = text.unicode(); const TQChar *endP = p + text.length(); uint i = 0; bool scanForSemicolon = false; @@ -793,13 +793,13 @@ void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags ) if ( entityValue.isNull() ) continue; - const uint ampersandPos = ampersand - text.tqunicode(); + const uint ampersandPos = ampersand - text.unicode(); text[ ampersandPos ] = entityValue; text.remove( ampersandPos + 1, entityLength + 1 ); i = ampersandPos; - p = text.tqunicode() + i; - endP = text.tqunicode() + text.length(); + p = text.unicode() + i; + endP = text.unicode() + text.length(); ampersand = 0; uint adjustment = entityLength + 1; @@ -1225,7 +1225,7 @@ TextParag::~TextParag() { } -void TextParag::tqlayout( int width ) +void TextParag::layout( int width ) { TQPtrList items; @@ -1658,7 +1658,7 @@ void TextView::viewportResizeEvent( TQResizeEvent *ev ) TQScrollView::viewportResizeEvent(ev); if ( ev->size().width() != ev->oldSize().width() ) - tqlayout(); + layout(); int newdiff = ev->size().height() - ev->oldSize().height(); setContentsPos( 0, contentsY()-newdiff ); @@ -1720,7 +1720,7 @@ void TextView::clear() stopAutoScroll(); clearSelection(); m_parags.clear(); - tqlayout(); + layout(); viewport()->erase(); } @@ -1728,7 +1728,7 @@ TextParagIterator TextView::appendParag( const TQString &richText ) { TextParag *parag = new TextParag( this, richText ); m_parags.append( parag ); - tqlayout( false ); + layout( false ); scrollToBottom(); TQPtrListIterator it( m_parags ); it.toLast(); @@ -1758,7 +1758,7 @@ bool TextView::removeParag( const TextParagIterator ¶g ) if(m_selectionEnd.item != 0) m_selectionEnd.pos.ry() -= height; - //tqlayout( false ); + //layout( false ); contentsChange(-height, true); @@ -1814,7 +1814,7 @@ void TextView::setLinkColor( const TQColor &linkColor ) void TextView::copy() { - TQApplication::tqclipboard()->setText( m_selectedText ); + TQApplication::clipboard()->setText( m_selectedText ); } void TextView::clearSelectionInternal() @@ -1953,7 +1953,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) m_selectionMaybeStart = SelectionPoint(); if ( (ev->button() & Qt::LeftButton) && !m_selectedText.isEmpty() ) - TQApplication::tqclipboard()->setText( m_selectedText, TQClipboard::Selection ); + TQApplication::clipboard()->setText( m_selectedText, TQClipboard::Selection ); if ( clicked ) { emitLinkClickedForMouseEvent( ev ); @@ -1962,7 +1962,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) if (ev->button() & Qt::MidButton) { - emit pasteReq( KApplication::tqclipboard()->text( TQClipboard::Selection ) ); + emit pasteReq( KApplication::clipboard()->text( TQClipboard::Selection ) ); return; } } @@ -1973,7 +1973,7 @@ void TextView::fontChange( const TQFont & ) for (; it.current(); ++it ) it.current()->fontChange( font() ); - tqlayout( true ); + layout( true ); } void TextView::startDrag() @@ -2156,7 +2156,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection return selectedText; } -void TextView::tqlayout( bool force ) +void TextView::layout( bool force ) { int height = 0; int contentsWidth = visibleWidth(); @@ -2166,7 +2166,7 @@ void TextView::tqlayout( bool force ) for (; it.current(); ++it ) { if ( !it.current()->isLayouted() || force ) - it.current()->tqlayout( width ); + it.current()->layout( width ); height += it.current()->height(); contentsWidth = kMax( contentsWidth, it.current()->minWidth() ); @@ -2182,7 +2182,7 @@ void TextView::tqlayout( bool force ) void TextView::contentsChange(int heightChange, bool force) { if(m_height == -1){ - tqlayout(force); + layout(force); } else { m_height += heightChange; @@ -2248,7 +2248,7 @@ void TextParagIterator::setRichText( const TQString &richText ) m_paragIt.current()->setRichText( richText ); TextView *textView = m_paragIt.current()->textView(); - textView->tqlayout( false ); + textView->layout( false ); if ( textView->isUpdatesEnabled() ) textView->updateContents(); diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 1ac273eb..1c537e95 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -40,7 +40,7 @@ struct StringPtr StringPtr( const TQChar *_ptr, uint _len ) : ptr( _ptr ), len( _len ) {} explicit StringPtr( const TQString &s ) // use with care! - : ptr( s.tqunicode() ), len( s.length() ) {} + : ptr( s.unicode() ), len( s.length() ) {} inline bool isNull() const { return ptr == 0; } @@ -354,7 +354,7 @@ public: ~TextParag(); - void tqlayout( int width ); + void layout( int width ); void paint( TQPainter &p, int y, int maxY ); @@ -537,7 +537,7 @@ private: SelectionPoint *selectionStart(); SelectionPoint *selectionEnd(); - void tqlayout( bool force = true ); + void layout( bool force = true ); Item *itemAt( const TQPoint &pos, SelectionPoint *selectionInfo = 0, Item::SelectionAccuracy accuracy = Item::SelectExact ); diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 32c37e47..597b2393 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -308,7 +308,7 @@ void KSircView::openBrowser(const TQString &url ) void KSircView::copyLinkToClipboard( const TQString &url ) { - TQApplication::tqclipboard()->setText( url, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( url, TQClipboard::Clipboard ); } TQColor KSircView::ircColor(int code) diff --git a/ksirc/nickColourMaker.cpp b/ksirc/nickColourMaker.cpp index c5a3b972..ce866349 100644 --- a/ksirc/nickColourMaker.cpp +++ b/ksirc/nickColourMaker.cpp @@ -43,7 +43,7 @@ int nickColourMaker::findIdx(TQString nick) const return -1; for(i = 0; i < nick.length(); i++){ - c = nick[i].tqunicode(); + c = nick[i].unicode(); switch(c){ case '|': case '-': diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index 8cae9c86..c6bf8136 100644 --- a/ksirc/puke/HOWTO-PUKE.pod +++ b/ksirc/puke/HOWTO-PUKE.pod @@ -11,7 +11,7 @@ under Linux. Puke's a generic protocol allowing dsirc to communicate with ksirc. Communications works over a unix domain socket between multiple client dsirc process's to a single ksirc process. All communications -is done via a variable length message with the following tqlayout: +is done via a variable length message with the following layout: =begin text @@ -68,17 +68,17 @@ supporting perl5-oop object. The C++ code must be able to hand all required settings and messages for the widget. Each new widget iherites it's parent and so forth -allowing for a nice oop tqlayout. The widget structure the author is +allowing for a nice oop layout. The widget structure the author is following is the same as Qt's. Their seems to work well, why re-invent the wheel? =item 2.1.1 General Layout, etc Figure where your new widget goes in the heirachy. If it's a simple -Qt widget, I recommend using their existing tqlayout. Man pages list +Qt widget, I recommend using their existing layout. Man pages list what widgets inherit what. -The general idea behind the widget tqlayout should be to be to provide +The general idea behind the widget layout should be to be to provide all the functionality of the widget to dsirc perl script. Incoming messages are handled via the messageHandler and ALL messages should return an ACK with current state info. diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h index fc7f0f0d..ead9fb07 100644 --- a/ksirc/puke/commands.h +++ b/ksirc/puke/commands.h @@ -993,14 +993,14 @@ #define PWIDGET_OBJFINDER 18 -// Group tqlayout commands exist between 10000 and 11000 +// Group layout commands exist between 10000 and 11000 -// Desc: create new box tqlayout +// Desc: create new box layout // iWinId: PWidget parent // iArg: 2 shorts, short[0] direction, short[1] border // cArg: random character string #define PUKE_LAYOUT_NEW 11000 -// Desc: ack for box tqlayout +// Desc: ack for box layout // iWinId: Layout ID. // iArg: not define // cArg: same random m character string as PUKE_LAYOUT_NEW @@ -1009,7 +1009,7 @@ #define PUKE_LAYOUT_ADDLAYOUT 11005 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005 -// Desc: add widget into tqlayout manager +// Desc: add widget into layout manager // iWinId: Layout Manager to add widget too // iArg: Widget Id to be added // cArg: 2 characters, char[0] strech, char[1] alignment @@ -1032,7 +1032,7 @@ // cArg: not define #define PUKE_LAYOUT_ADDSTRUT_ACK -11015 -// Desc: activates tqlayout management, like show() for widget +// Desc: activates layout management, like show() for widget // iWinId: Layout Manager to activate // iArg: undef // cArg: undef diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm index 410437e7..65bc1b07 100644 --- a/ksirc/puke/dcc_status.pm +++ b/ksirc/puke/dcc_status.pm @@ -6,7 +6,7 @@ &docommand("/load ptablevw.pm"); &docommand("/load plistbox.pm"); &docommand("/load pbutton.pm");; -&docommand("/load pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plabel.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm index 048eb9eb..26594c0f 100644 --- a/ksirc/puke/load_all.pm +++ b/ksirc/puke/load_all.pm @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm index 9896fd1c..505ddc0d 100644 --- a/ksirc/puke/pboxlayout.pm +++ b/ksirc/puke/pboxlayout.pm @@ -40,7 +40,7 @@ sub new { #} # else{ if(ref($widget) ne ''){ - # print "*\cbI\cb* Generic Non-topleve tqlayout type\n"; + # print "*\cbI\cb* Generic Non-topleve layout type\n"; $self->{Parent} = $widget; $self->{ParentType} = 'Widget'; $self->{Direction} = shift; @@ -99,7 +99,7 @@ sub addWidget { my $align = shift; if($self->{Added} == 0){ - print "*E* Burp: Can't add widget without first being added to parent tqlayout\n"; + print "*E* Burp: Can't add widget without first being added to parent layout\n"; return; } @@ -128,41 +128,41 @@ sub addLayout { my $self = shift; if($self->{Added} == 0){ - print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n"; + print "*E* Burp: Can't add layout without first being added to parent layout\n"; } - my $tqlayout = shift; - if(ref($tqlayout) ne 'PBoxLayout'){ - print "*E* Passed non tqlayout type to addLayout\n"; + my $layout = shift; + if(ref($layout) ne 'PBoxLayout'){ + print "*E* Passed non layout type to addLayout\n"; return 1; } - if($tqlayout->{iWinId} <= 0){ - print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n"; + if($layout->{iWinId} <= 0){ + print "*E* Trying to add invalid layout " . ref($layout) . "\n"; return; } # make sure we can run, and the widget we want to add can run. - # my @ARG = ($tqlayout); + # my @ARG = ($layout); #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; - #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; + #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT, 'iWinId' => $self->{iWinId}, - 'iArg' => $tqlayout->{iWinId}, + 'iArg' => $layout->{iWinId}, 'cArg' => pack("C", 0), 'CallBack' => sub { }, 'WaitFor' => 1); - # print "*I* Adding tqlayout\n"; + # print "*I* Adding layout\n"; if($REPLY{'iArg'} != 0){ print "*E* AddLayout call failed\n"; } else{ - # print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n"; - $tqlayout->{Added} = 1; + # print "*I* Added new Layout for " . $layout->{iWinId} . "\n"; + $layout->{Added} = 1; } } diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp index 3dbe5c87..a2b6fbae 100644 --- a/ksirc/puke/playout.cpp +++ b/ksirc/puke/playout.cpp @@ -16,7 +16,7 @@ PLayout::~PLayout() // kdDebug(5008) << "PObject: in destructor" << endl; /* delete widget(); - tqlayout = 0; + layout = 0; setWidget(); */ } @@ -34,12 +34,12 @@ PObject *PLayout::createWidget(CreateArgs &ca) if((ca.parent != 0) && (ca.parent->widget()->isWidgetType() == TRUE)){ qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl; + // kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl; } else{ qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating tqlayout NO PARENT" << endl; + // kdDebug(5008) << "Creating layout NO PARENT" << endl; } pw->setWidget(qbl); pw->setWidgetId(ca.pwI); @@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout) return; } - tqlayout = (TQBoxLayout *) _layout; + layout = (TQBoxLayout *) _layout; PObject::setWidget(_layout); } TQBoxLayout *PLayout::widget() { - return tqlayout; + return layout; } -#include "ptqlayout.moc" +#include "playout.moc" diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h index 4124cb14..1cc4290f 100644 --- a/ksirc/puke/playout.h +++ b/ksirc/puke/playout.h @@ -36,7 +36,7 @@ public: private: - TQBoxLayout *tqlayout; + TQBoxLayout *layout; }; diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl index fdeae902..7e7b251d 100644 --- a/ksirc/puke/small.pl +++ b/ksirc/puke/small.pl @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl index 369a2dc9..4b4c3169 100644 --- a/ksirc/puke/test.pl +++ b/ksirc/puke/test.pl @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks index d73fa513..a0b2a56a 100644 --- a/ksirc/puke/user_monitor.ks +++ b/ksirc/puke/user_monitor.ks @@ -3,7 +3,7 @@ &docommand("/load pframe.pm"); &docommand("/load ptablevw.pm"); &docommand("/load plistbox.pm"); -&docommand("/load pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plabel.pm"); &docommand("/load pmenudta.pm"); &docommand("/load ppopmenu.pm"); diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 67b51c3c..57f26fb5 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -85,7 +85,7 @@ TQStringList KSircTopLevel::cmd_menu; void KSircTopLevel::initColors() { - TQColorGroup cg_mainw = kapp->tqpalette().active(); + TQColorGroup cg_mainw = kapp->palette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); @@ -216,7 +216,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->setAccel(Key_F, KST_CHANNEL_ID); /* - * Ok, let's look at the basic widget "tqlayout" + * Ok, let's look at the basic widget "layout" * Everything belongs to q TQFrame F, this is use so we * can give the KApplication a single main client widget, which is needs. * @@ -1104,7 +1104,7 @@ void KSircTopLevel::returnPressed() uint i; TQChar c; for(i = 0; (c = s[i]); i++){ - switch(c.tqunicode()){ + switch(c.unicode()){ case 0336: s[i] = 002; break; @@ -1327,13 +1327,13 @@ void KSircTopLevel::control_message(int command, TQString str) // nicks->show(); // lag->show(); } - if(tqlayout()) { - //kdDebug(5008) << "Redoeing tqlayout" << endl; - tqlayout()->invalidate(); - tqlayout()->activate(); + if(layout()) { + //kdDebug(5008) << "Redoeing layout" << endl; + layout()->invalidate(); + layout()->activate(); } else { - //kdDebug(5008) << "No tqlayout" << endl; + //kdDebug(5008) << "No layout" << endl; } pan->refresh(); @@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick) void KSircTopLevel::pasteToWindow() { // Ctrl-V - //kdDebug(5008) << "Going to paste: " << KApplication::tqclipboard()->text( TQClipboard::Clipboard ) << endl; - slotTextDropped(KApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( TQClipboard::Clipboard ) << endl; + slotTextDropped(KApplication::clipboard()->text( TQClipboard::Clipboard ) ); } void KSircTopLevel::pasteToNickList(int button, @@ -1510,7 +1510,7 @@ void KSircTopLevel::pasteToNickList(int button, emit open_toplevel(ci); TQStringList lines = TQStringList::split( '\n', - KApplication::tqclipboard()->text( TQClipboard::Selection ), + KApplication::clipboard()->text( TQClipboard::Selection ), true ); TQStringList::ConstIterator it = lines.begin(); TQStringList::ConstIterator end = lines.end(); diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index bd68e17a..06f1e9b8 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -36,11 +36,11 @@ KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) config = new KSimpleConfig("ktalkdrc"); announceconfig = new KSimpleConfig("ktalkannouncerc"); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); soundpage = new KSoundPageConfig(this, "soundpage", config, announceconfig); answmachpage = new KAnswmachPageConfig(this, "answmachpage", config); diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index cc62da3f..9f7d70ac 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -66,7 +66,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, extprg_box->setColumnLayout( 0, Qt::Horizontal ); toplay->addWidget(extprg_box); - TQGridLayout* l = new TQGridLayout(extprg_box->tqlayout()); + TQGridLayout* l = new TQGridLayout(extprg_box->layout()); extprg_edit = new KURLRequester(extprg_box); l->addWidget(extprg_edit, 2, 4); diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index 2f02e2fa..558b6f62 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -35,8 +35,8 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) :KCModule(parent) ,m_config(config,false,true) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQGroupBox* group=new TQGroupBox(1,Qt::Horizontal, i18n("Show Links for Following Services"), this); @@ -53,13 +53,13 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) label->setBuddy(m_defaultLisaHostLe); TQWidget *w=new TQWidget(this); - tqlayout->setStretchFactor(m_ftpSettings,0); - tqlayout->setStretchFactor(m_httpSettings,0); - tqlayout->setStretchFactor(m_nfsSettings,0); - tqlayout->setStretchFactor(m_smbSettings,0); - tqlayout->setStretchFactor(m_shortHostnames,0); - tqlayout->setStretchFactor(hbox,0); - tqlayout->setStretchFactor(w,1); + layout->setStretchFactor(m_ftpSettings,0); + layout->setStretchFactor(m_httpSettings,0); + layout->setStretchFactor(m_nfsSettings,0); + layout->setStretchFactor(m_smbSettings,0); + layout->setStretchFactor(m_shortHostnames,0); + layout->setStretchFactor(hbox,0); + layout->setStretchFactor(w,1); connect(m_ftpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); connect(m_httpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 21f51474..e17cf5b0 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -55,8 +55,8 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) ,m_configFilename(config) ,m_changed(false) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQWidget *dummy(0); @@ -83,7 +83,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) TQGrid *addressesGrid = new TQGrid(2, Qt::Horizontal, this); addressesGrid->setSpacing(10); - tqlayout->setStretchFactor(addressesGrid,0); + layout->setStretchFactor(addressesGrid,0); label=new TQLabel(i18n("&Broadcast network address:"),addressesGrid); comment=i18n("Your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); @@ -102,7 +102,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) label->setBuddy(m_allowedAddresses); dummy=new TQWidget(this); - tqlayout->setStretchFactor(dummy,10); + layout->setStretchFactor(dummy,10); hbox = new TQHBox(this); hbox->setSpacing(10); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 5d6285d0..fcaf104c 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -53,8 +53,8 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) ,m_maxPingsAtOnce(0) ,m_reslisaAdvancedDlg(0) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *gb=new TQVButtonGroup(i18n("Tell ResLISa Daemon How to Search for Hosts"),this); gb->setInsideSpacing(10); diff --git a/librss/loader.cpp b/librss/loader.cpp index e4523b07..0ca68389 100644 --- a/librss/loader.cpp +++ b/librss/loader.cpp @@ -256,7 +256,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) } /* It seems that some Microsoft-developed code generates UTF-8 files - * with the three leading tqunicode characters 0357, 0273, 0277. For + * with the three leading unicode characters 0357, 0273, 0277. For * an example, check http://msdn.microsoft.com/rss.xml */ if (len > 3 && TQChar(*charData) == TQChar(0357)) { diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index f2e3df7d..f5aedf41 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -18,7 +18,7 @@ - tqlayout16 + layout16 @@ -91,7 +91,7 @@ - tqlayout13 + layout13 @@ -137,7 +137,7 @@ - tqlayout11 + layout11 @@ -189,7 +189,7 @@ - tqlayout6 + layout6 @@ -297,7 +297,7 @@ - tqlayout5 + layout5 @@ -365,7 +365,7 @@ - tqlayout14 + layout14 @@ -403,7 +403,7 @@ - tqlayout17 + layout17 diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index fa62e58a..1d6bcbe3 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -360,8 +360,8 @@ KWiFiManagerApp::initView () view = new TQWidget (this, "mainwidget"); view->setBackgroundMode (PaletteBackground); setCentralWidget (view); - TQGridLayout *zentraltqlayout = new TQGridLayout (view); - zentraltqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *zentrallayout = new TQGridLayout (view); + zentrallayout->setMargin( KDialog::marginHint() ); speedmeter = new Speed (view, device); status = new Status (view, device); location = new Locator (view, device); @@ -377,12 +377,12 @@ KWiFiManagerApp::initView () strength->setMinimumSize (strength->mySizeHint()); speedmeter->setMinimumHeight (60); status->setMinimumHeight (60); - zentraltqlayout->addWidget (pictogram, 0, 0); - zentraltqlayout->addWidget (strength, 1, 0); - zentraltqlayout->addWidget (speedmeter, 0, 1); - zentraltqlayout->addMultiCellWidget (status, 1, 2, 1, 1); - zentraltqlayout->addWidget (scan, 2, 0); - zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); + zentrallayout->addWidget (pictogram, 0, 0); + zentrallayout->addWidget (strength, 1, 0); + zentrallayout->addWidget (speedmeter, 0, 1); + zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1); + zentrallayout->addWidget (scan, 2, 0); + zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ())); connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ()));