From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/options/optw_irc.cpp | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/modules/options/optw_irc.cpp') diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 537fde9a..56552a23 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -28,11 +28,11 @@ #include "kvi_options.h" #include "kvi_ircmask.h" -#include +#include -KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent) -: KviOptionsWidget(parent,"irc_options_widget") +KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * tqparent) +: KviOptionsWidget(tqparent,"irc_options_widget") { } @@ -42,8 +42,8 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget() } -KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent) -: KviOptionsWidget(parent,"irc_options_widget") +KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * tqparent) +: KviOptionsWidget(tqparent,"irc_options_widget") { createLayout(3,1); KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect); @@ -68,18 +68,18 @@ KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget() -KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent) -: KviOptionsWidget(parent,"irc_advanced_options_widget") +KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * tqparent) +: KviOptionsWidget(tqparent,"irc_advanced_options_widget") { createLayout(3,1); KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); #ifdef COMPILE_INFO_TIPS mergeTip(b, __tr2qs_ctx("
This option causes KVIrc to close " \ - "the connection immediately after sending the QUIT message.
" \ + "the connection immediately after sending the TQUIT message.
" \ "When this option is disabled, KVIrc will wait for the server " \ "to close the connection.
" \ - "Note that if you use this, your QUIT message may be not displayed.
","options")); + "Note that if you use this, your TQUIT message may be not displayed.","options")); #endif addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname); } @@ -92,7 +92,7 @@ KviIrcAdvancedOptionsWidget::~KviIrcAdvancedOptionsWidget() -KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent) +KviChannelOptionsWidget::KviChannelOptionsWidget(TQWidget * pParent) : KviOptionsWidget(pParent) { } @@ -102,7 +102,7 @@ KviChannelOptionsWidget::~KviChannelOptionsWidget() } -KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent) +KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(TQWidget * pParent) : KviOptionsWidget(pParent) { createLayout(5,1); @@ -160,28 +160,28 @@ KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget() } -KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent) +KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pParent) : KviOptionsWidget(pParent) { createLayout(6,4); KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory); - addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options")); + addLabel(0,1,0,1,__tr2qs_ctx("Default ban tqmask:","options")); - m_pBanTypeCombo=new QComboBox(this); + m_pBanTypeCombo=new TQComboBox(this); addWidgetToLayout(m_pBanTypeCombo,1,1,4,1); - KviIrcMask hostmask("nick!user@machine.host.top"); - KviIrcMask ipmask("nick!user@192.168.1.2"); - QString tmp1; - QString tmp2; + KviIrcMask hosttqmask("nick!user@machine.host.top"); + KviIrcMask iptqmask("nick!user@192.168.1.2"); + TQString tmp1; + TQString tmp2; for(int i=0;i<=26;i++) { - hostmask.mask(tmp1,(KviIrcMask::MaskType)i); - ipmask.mask(tmp2,(KviIrcMask::MaskType)i); - m_pBanTypeCombo->insertItem(QString("%1 (%2)").arg(tmp1).arg(tmp2)); + hosttqmask.tqmask(tmp1,(KviIrcMask::MaskType)i); + iptqmask.tqmask(tmp2,(KviIrcMask::MaskType)i); + m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2)); } m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); -- cgit v1.2.1