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/container.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/modules/options/container.cpp') diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index 7e2272c1..d86abbba 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -27,19 +27,19 @@ #include "kvi_iconmanager.h" #include "kvi_app.h" -#include -#include +#include +#include #include "kvi_tal_tooltip.h" -#include +#include #ifdef COMPILE_USE_QT4 - #include + #include #endif extern KviOptionsInstanceManager * g_pOptionsInstanceManager; -KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal) -: QDialog(par,"container","options") +KviOptionsWidgetContainer::KviOptionsWidgetContainer(TQWidget * par,bool bModal) +: TQDialog(par,"container","options") { m_pOptionsWidget = 0; setModal(bModal); @@ -52,23 +52,23 @@ KviOptionsWidgetContainer::~KviOptionsWidgetContainer() void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) { - QGridLayout * g = new QGridLayout(this,2,3,4,8); + TQGridLayout * g = new TQGridLayout(this,2,3,4,8); g->addMultiCellWidget(w,0,0,0,2); - QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); + 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->sizeHint().width()); + //b->setMinimumWidth(m_pCancel->tqsizeHint().width()); g->addWidget(b,1,1); b->setDefault(true); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); - m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this); + m_pCancel = new TQPushButton(__tr2qs_ctx("Cancel","options"),this); KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); g->addWidget(m_pCancel,1,2); - connect(m_pCancel,SIGNAL(clicked()),this,SLOT(cancelClicked())); + connect(m_pCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); @@ -86,20 +86,20 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) } -void KviOptionsWidgetContainer::closeEvent(QCloseEvent *e) +void KviOptionsWidgetContainer::closeEvent(TQCloseEvent *e) { e->ignore(); cancelClicked(); } -void KviOptionsWidgetContainer::showEvent(QShowEvent *e) +void KviOptionsWidgetContainer::showEvent(TQShowEvent *e) { - if(parent() == 0) + if(tqparent() == 0) { move((g_pApp->desktop()->width() - width()) / 2, (g_pApp->desktop()->height() - height()) / 2); } - QWidget::showEvent(e); + TQWidget::showEvent(e); m_pCancel->setFocus(); } -- cgit v1.2.1