From 805c2821ceaddada48b346c6d11bd0dc1351a539 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:33:07 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/modules/options/container.cpp | 4 +- src/modules/options/dialog.cpp | 18 ++++----- src/modules/options/mkcreateinstanceproc.sh | 6 +-- src/modules/options/optw_antispam.cpp | 4 +- src/modules/options/optw_away.cpp | 2 +- src/modules/options/optw_ctcpfloodprotection.cpp | 2 +- src/modules/options/optw_dcc.cpp | 2 +- src/modules/options/optw_highlighting.cpp | 2 +- src/modules/options/optw_identity.cpp | 10 ++--- src/modules/options/optw_ignore.cpp | 2 +- src/modules/options/optw_input.cpp | 4 +- src/modules/options/optw_interfacefeatures.cpp | 2 +- src/modules/options/optw_interfacelookglobal.cpp | 10 ++--- src/modules/options/optw_irc.cpp | 2 +- src/modules/options/optw_ircoutput.cpp | 2 +- src/modules/options/optw_ircview.cpp | 4 +- src/modules/options/optw_lag.cpp | 2 +- src/modules/options/optw_logging.cpp | 2 +- src/modules/options/optw_mediatypes.cpp | 48 ++++++++++++------------ src/modules/options/optw_messages.cpp | 14 +++---- src/modules/options/optw_nickserv.cpp | 4 +- src/modules/options/optw_notify.cpp | 2 +- src/modules/options/optw_protection.cpp | 2 +- src/modules/options/optw_proxy.cpp | 6 +-- src/modules/options/optw_query.cpp | 2 +- src/modules/options/optw_servers.cpp | 14 +++---- src/modules/options/optw_ssl.cpp | 2 +- src/modules/options/optw_taskbar.cpp | 2 +- src/modules/options/optw_textencoding.cpp | 4 +- src/modules/options/optw_texticons.cpp | 10 ++--- src/modules/options/optw_tools.cpp | 2 +- src/modules/options/optw_topiclabel.cpp | 2 +- src/modules/options/optw_tray.cpp | 2 +- src/modules/options/optw_uparser.cpp | 2 +- src/modules/options/optw_urlhandlers.cpp | 2 +- src/modules/options/optw_userlist.cpp | 6 +-- 36 files changed, 103 insertions(+), 103 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index c0b7bf8a..097d7729 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -27,7 +27,7 @@ #include "kvi_iconmanager.h" #include "kvi_app.h" -#include +#include #include #include "kvi_tal_tooltip.h" #include @@ -59,7 +59,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this); KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); - //b->setMinimumWidth(m_pCancel->tqsizeHint().width()); + //b->setMinimumWidth(m_pCancel->sizeHint().width()); g->addWidget(b,1,1); b->setDefault(true); connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index b00eba60..8b7242fb 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -32,7 +32,7 @@ #include "kvi_module.h" #include "kvi_styled_controls.h" #include "kvi_pointerhashtable.h" -#include +#include #include "kvi_accel.h" #include #include "kvi_tal_vbox.h" @@ -69,8 +69,8 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif - l->tqsetAlignment(TQt::AlignTop); - tqlayout()->addWidget(l,0,0); + l->setAlignment(TQt::AlignTop); + layout()->addWidget(l,0,0); } KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget() @@ -179,7 +179,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) "" \ "" \ "" - ).tqarg(szDialogTitle).tqarg(szDialog).tqarg(szInfoTips).tqarg(szOkCancelButtons); + ).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons); TQString szCaption = szDialogTitle + " - KVIrc"; setCaption(szCaption); @@ -534,10 +534,10 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerListbIsContainer) { - // it's a container: add only eventual not contained tqchildren (containers or explicitly marked as not contained) + // it's a container: add only eventual not contained children (containers or explicitly marked as not contained) fillListView(it,e->pChildList,szGroup,true); } else { - // it's not a container, add any tqchildren + // it's not a container, add any children fillListView(it,e->pChildList,szGroup,false); } } @@ -578,7 +578,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem if(it->m_pOptionsWidget == pPage)return it; KviOptionsListViewItem *i; - // run through the tqchildren + // run through the children i = (KviOptionsListViewItem *)(it->firstChild()); if(i) { @@ -586,7 +586,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem if(i)return i; } - // not found in the tqchildren tree.. look in the next sibling + // not found in the children tree.. look in the next sibling i = (KviOptionsListViewItem *)(it->nextSibling()); if(i) { @@ -647,7 +647,7 @@ void KviOptionsDialog::closeEvent(TQCloseEvent *e) void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it) { - // First commit the tqchildren + // First commit the children if(!it) return; KviOptionsListViewItem *it2 = (KviOptionsListViewItem *)it->firstChild(); while(it2) diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index 1a25a14d..9947aff7 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -271,7 +271,7 @@ printclass() fi } -addtqchildren() +addchildren() { if [ -f "$CLASSDIR/$2" ]; then LEVEL=`cat $CLASSDIR/$2` @@ -282,7 +282,7 @@ addtqchildren() echo "$3 e$1->pChildList = new KviPointerList;" >> $TARGET echo "$3 e$1->pChildList->setAutoDelete(true);" >> $TARGET NEXTLEVEL=`expr $1 + 1` - addtqchildren $NEXTLEVEL $achild "$3 " + addchildren $NEXTLEVEL $achild "$3 " else echo "$3 e$1->pChildList = 0;" >> $TARGET fi @@ -290,7 +290,7 @@ addtqchildren() fi } -addtqchildren 0 NOPARENT "" +addchildren 0 NOPARENT "" rm -fr $CLASSDIR diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 43cc13e9..edb2dc40 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -22,7 +22,7 @@ #include "optw_antispam.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" @@ -47,7 +47,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent) reenableStuff(true); - tqlayout()->setRowStretch(2,1); + layout()->setRowStretch(2,1); } KviAntispamOptionsWidget::~KviAntispamOptionsWidget() diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 0faf216e..546b232d 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -23,7 +23,7 @@ #include "optw_away.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index a0604d9b..82b3f95e 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -22,7 +22,7 @@ #include "optw_ctcpfloodprotection.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 8ddf15bc..f32dfc50 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -24,7 +24,7 @@ #include "optw_dcc.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index fdb8e908..2ecbc0bc 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -24,7 +24,7 @@ #include "optw_highlighting.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 57b67a48..bf270c49 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "kvi_tal_tooltip.h" #include #include @@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare createLayout(3,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options")); KviTalHBox * hb = new KviTalHBox(gbox); @@ -492,7 +492,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent : KviOptionsWidget(parent) { createLayout(4,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar)); @@ -540,7 +540,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar())); - tqlayout()->setRowStretch(1,2); + layout()->setRowStretch(1,2); } KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget() @@ -678,7 +678,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa createLayout(2,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options")); m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI); diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 9d6b56a8..90bec09a 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -22,7 +22,7 @@ #include "optw_ignore.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index c1ad6e84..a125f769 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -21,7 +21,7 @@ // #include "optw_input.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" @@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent) } - tqlayout()->setRowStretch(7,1); + layout()->setRowStretch(7,1); } KviInputLookOptionsWidget::~KviInputLookOptionsWidget() diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 780c493f..e10e3059 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -24,7 +24,7 @@ #include "optw_interfacefeatures.h" -#include +#include #include #include diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index 1e2c998f..a0e5aedb 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -22,7 +22,7 @@ #include "optw_interfacelookglobal.h" -#include +#include #include "kvi_settings.h" #include "kvi_options.h" @@ -104,13 +104,13 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde)); - tqlayout()->setRowStretch(6,1); + layout()->setRowStretch(6,1); connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); #else //!COMPILE_KDE_SUPPORT m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - tqlayout()->setRowStretch(4,1); + layout()->setRowStretch(4,1); #endif //!COMPILE_KDE_SUPPORT connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); @@ -177,7 +177,7 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent) addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground); addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground); - tqlayout()->setRowStretch(1,1); + layout()->setRowStretch(1,1); } KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget() @@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidge addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground); - tqlayout()->setRowStretch(8,1); + layout()->setRowStretch(8,1); } KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index f39add08..a6cee9d0 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -181,7 +181,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar hostmask.mask(tmp1,(KviIrcMask::MaskType)i); ipmask.mask(tmp2,(KviIrcMask::MaskType)i); - m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2)); + m_pBanTypeCombo->insertItem(TQString("%1 (%2)").arg(tmp1).arg(tmp2)); } m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index 6446fe72..7ff21bee 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -22,7 +22,7 @@ #include "optw_ircoutput.h" -#include +#include #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 4bb80f59..8c38bfa9 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -21,7 +21,7 @@ // #include "optw_ircview.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" @@ -98,7 +98,7 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent) m_pVerticalAlign->setCurrentItem(0); } - tqlayout()->setRowStretch(2,1); + layout()->setRowStretch(2,1); } KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget() diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 8dce8615..fa964a9c 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -23,7 +23,7 @@ #include "optw_lag.h" -#include +#include #include "kvi_tal_tooltip.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index 378c1dd1..e935dfc6 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -23,7 +23,7 @@ #include "optw_logging.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index b93081e9..51cdad76 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -22,7 +22,7 @@ #include "optw_mediatypes.h" -#include +#include #include #include "kvi_tal_tooltip.h" @@ -77,72 +77,72 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent) connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *))); - tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2); + layout()->addMultiCellWidget(m_pListView,0,0,0,2); TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this); - tqlayout()->addWidget(l,1,0); + layout()->addWidget(l,1,0); m_pDescription = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2); + layout()->addMultiCellWidget(m_pDescription,1,1,1,2); l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this); - tqlayout()->addWidget(l,2,0); + layout()->addWidget(l,2,0); m_pIanaType = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2); + layout()->addMultiCellWidget(m_pIanaType,2,2,1,2); l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this); - tqlayout()->addWidget(l,3,0); + layout()->addWidget(l,3,0); m_pFileMask = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2); + layout()->addMultiCellWidget(m_pFileMask,3,3,1,2); l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this); - tqlayout()->addWidget(l,4,0); + layout()->addWidget(l,4,0); m_pMagicBytes = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); + layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); l = new TQLabel(__tr2qs_ctx("Save path:","options"),this); - tqlayout()->addWidget(l,5,0); + layout()->addWidget(l,5,0); m_pSavePath = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2); + layout()->addMultiCellWidget(m_pSavePath,5,5,1,2); l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this); - tqlayout()->addWidget(l,6,0); + layout()->addWidget(l,6,0); m_pCommandline = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2); + layout()->addMultiCellWidget(m_pCommandline,6,6,1,2); #ifdef COMPILE_INFO_TIPS mergeTip(m_pCommandline,__tr2qs_ctx("
This field contains the command to execute to open a local file.
" \ "$0 is used in place of the filename
","options")); #endif l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this); - tqlayout()->addWidget(l,7,0); + layout()->addWidget(l,7,0); m_pRemoteExecCommandline = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); + layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); #ifdef COMPILE_INFO_TIPS mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("
This field contains the command to execute when automatically opening a received file.
" \ "$0 is used in place of the filename
","options")); #endif l = new TQLabel(__tr2qs_ctx("Icon","options"),this); - tqlayout()->addWidget(l,8,0); + layout()->addWidget(l,8,0); m_pIcon = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2); + layout()->addMultiCellWidget(m_pIcon,8,8,1,2); TQFrame * f = new TQFrame(this); f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine); - tqlayout()->addMultiCellWidget(f,9,9,0,2); + layout()->addMultiCellWidget(f,9,9,0,2); TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this); connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType())); - tqlayout()->addWidget(b,10,1); + layout()->addWidget(b,10,1); m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this); connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType())); - tqlayout()->addWidget(m_pDelete,10,2); + layout()->addWidget(m_pDelete,10,2); - tqlayout()->setColStretch(1,1); - tqlayout()->setColStretch(2,1); - tqlayout()->setRowStretch(0,1); + layout()->setColStretch(1,1); + layout()->setColStretch(2,1); + layout()->setRowStretch(0,1); m_pLastItem = 0; diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 175f119b..faf26954 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -26,7 +26,7 @@ #include "optw_messages.h" -#include +#include #include #include "kvi_tal_vbox.h" #include @@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent addRowSpacer(0,4,3,4); - tqlayout()->setRowStretch(4,1); + layout()->setRowStretch(4,1); } KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget() @@ -261,14 +261,14 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy()))); p->drawTiledPixmap(0,0,w,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap(); if(pix) { - TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy()))); p->fillRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground)); p->drawTiledPixmap(0,0,w,height(),*pix,pnt.x(),pnt.y()); } else { @@ -335,7 +335,7 @@ void KviMessageColorListBoxItem::paint(TQPainter * p) clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : TQt::gray; p->fillRect(0,0,width(lb),height(lb),clr); } else { - clr = listBox()->tqcolorGroup().background(); + clr = listBox()->colorGroup().background(); KviTalListBoxText::paint(p); } if(isSelected()) @@ -464,8 +464,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent) it = new KviMessageListViewItem(m_pListView,i); } - tqlayout()->setRowStretch(0,1); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + layout()->setColStretch(0,1); connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *))); connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *))); diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 19a7683d..0fa796c4 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -24,7 +24,7 @@ #include "optw_nickserv.h" -#include +#include #include "kvi_tal_tooltip.h" #include "kvi_tal_listview.h" #include @@ -236,7 +236,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent) { createLayout(3,3); - TQGridLayout * gl = tqlayout(); + TQGridLayout * gl = layout(); KviNickServRuleSet * rs = g_pNickServRuleSet; bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 8688cdc6..4e75c076 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -22,7 +22,7 @@ #include "optw_notify.h" -#include +#include #include "kvi_settings.h" #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 5f125101..65bec77f 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -24,7 +24,7 @@ #include "optw_protection.h" -#include +#include #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index f5db3256..aa9cedac 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -104,7 +104,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this); - //TQGridLayout * gl = new TQGridLayout(gbox->tqlayout()); + //TQGridLayout * gl = new TQGridLayout(gbox->layout()); //gl->setMargin(2); //gl->setSpacing(4); @@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) fillProxyList(); - tqlayout()->setRowStretch(0,1); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + layout()->setColStretch(0,1); m_pContextPopup = new KviTalPopupMenu(this); diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index dfaca3bb..a11f0a7d 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -23,7 +23,7 @@ #include "optw_query.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 319f5be8..3706f10c 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -102,7 +102,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * TQLabel * l = new TQLabel(szTmp,this); l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); l->setMargin(10); g->addMultiCellWidget(l,0,0,0,3); l->setMinimumWidth(200); @@ -451,7 +451,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) m_pHeaderLabel = new TQLabel("",this); // the text will be set later m_pHeaderLabel->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); - m_pHeaderLabel->tqsetAlignment(TQt::AlignCenter); + m_pHeaderLabel->setAlignment(TQt::AlignCenter); m_pHeaderLabel->setMargin(10); g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3); m_pHeaderLabel->setMinimumWidth(200); @@ -732,7 +732,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) KviPointerList * proxylist = g_pProxyDataBase->proxyList(); for(KviProxy * p = proxylist->first();p;p = proxylist->next()) { - m_pProxyEditor->insertItem(TQString("%1:%2").tqarg(p->hostname()).tqarg(p->port())); + m_pProxyEditor->insertItem(TQString("%1:%2").arg(p->hostname()).arg(p->port())); } if(m_pProxyEditor->count() > (s->proxy()+2)) m_pProxyEditor->setCurrentItem(s->proxy()+2); @@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) fillServerList(); - tqlayout()->setRowStretch(0,1); - //tqlayout()->setColStretch(1,5); - //tqlayout()->setColStretch(2,2); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + //layout()->setColStretch(1,5); + //layout()->setColStretch(2,2); + layout()->setColStretch(0,1); setMinimumWidth(320); } diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 54135f69..46da0619 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -22,7 +22,7 @@ #include "optw_ssl.h" -#include +#include #include #include "kvi_options.h" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 201766cd..0c85ea7e 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -161,7 +161,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW m_pVerticalAlign->setCurrentItem(0); } - tqlayout()->setRowStretch(1,1); + layout()->setRowStretch(1,1); } diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 495df00a..fc915ed4 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -68,7 +68,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("Automatic detection","options")); m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("en","options")); - TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath()); + TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath()); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); //We Have setted locale, but not restarted kvirc @@ -121,7 +121,7 @@ void KviTextEncodingOptionsWidget::commit() } idx=m_pForcedLocaleCombo->currentItem(); - TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath()); + TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath()); if(idx==0) { if(KviFileUtils::fileExists(szLangFile)) KviFileUtils::removeFile(szLangFile); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 3d6e01bc..b8ae293c 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -27,7 +27,7 @@ #include "kvi_locale.h" #include "kvi_filedialog.h" -#include +#include #include #include "kvi_tal_hbox.h" @@ -37,7 +37,7 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc { m_pIconButton=new TQToolButton(this); m_pBrowseButton=new TQToolButton(this); - m_pBrowseButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum)); + m_pBrowseButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum)); m_pBrowseButton->setText("..."); m_pIcon = icon; m_pPopup = 0; @@ -160,14 +160,14 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent) ++it; } - tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1); + layout()->addMultiCellWidget(m_pTable,0,0,0,1); m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this); - tqlayout()->addWidget(m_pAdd,1,0); + layout()->addWidget(m_pAdd,1,0); connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this); - tqlayout()->addWidget(m_pDel,1,1); + layout()->addWidget(m_pDel,1,1); connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked())); m_pDel->setEnabled(false); diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index a1f3cf00..33347712 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -24,7 +24,7 @@ #include "optw_tools.h" -#include +#include #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index ec076dac..904eeaee 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviO addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground); addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground); - tqlayout()->setRowStretch(3, 1); + layout()->setRowStretch(3, 1); } KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index df6fd0ba..f0083c42 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -23,7 +23,7 @@ #include "optw_tray.h" -#include +#include #include "kvi_tal_tooltip.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 15fe465c..1a7c11ae 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -23,7 +23,7 @@ #include "optw_uparser.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 6e356770..1d712546 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -24,7 +24,7 @@ #include "optw_urlhandlers.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index 9785cf22..a18367dd 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -21,7 +21,7 @@ // #include "optw_userlist.h" -#include +#include #include "kvi_options.h" #include "kvi_locale.h" @@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T - //tqlayout()->setColStretch(0,1); - tqlayout()->setRowStretch(1,1); + //layout()->setColStretch(0,1); + layout()->setRowStretch(1,1); } KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget() -- cgit v1.2.1