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/logview/logviewmdiwindow.cpp | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/modules/logview/logviewmdiwindow.cpp') diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 97d50355..f2f11c26 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -47,7 +47,7 @@ #include #include "kvi_tal_popupmenu.h" #include -#include +#include #include @@ -55,7 +55,7 @@ #ifdef COMPILE_ZLIB_SUPPORT #include #endif -#include +#include #include "kvi_styled_controls.h" #include #include @@ -90,67 +90,67 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pSearchTab = new TQWidget(m_pTabWidget); m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview")); - TQGridLayout *tqlayout = new TQGridLayout(m_pSearchTab,10,2,3,5); + TQGridLayout *layout = new TQGridLayout(m_pSearchTab,10,2,3,5); m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab); m_pShowChannelsCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); + layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); m_pShowQueryesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab); m_pShowQueryesCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); + layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab); m_pShowConsolesCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); + layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); m_pShowDccChatCheck = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab); m_pShowDccChatCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); + layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); m_pShowOtherCheck = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab); m_pShowOtherCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); + layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); TQLabel *l; l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab); - tqlayout->addMultiCellWidget(l,5,5,0,1); + layout->addMultiCellWidget(l,5,5,0,1); l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab); m_pFileNameMask = new TQLineEdit(m_pSearchTab); connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(l,6,0); - tqlayout->addWidget(m_pFileNameMask,6,1); + layout->addWidget(l,6,0); + layout->addWidget(m_pFileNameMask,6,1); l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab); m_pContentsMask = new TQLineEdit(m_pSearchTab); connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(l,7,0); - tqlayout->addWidget(m_pContentsMask,7,1); + layout->addWidget(l,7,0); + layout->addWidget(m_pContentsMask,7,1); m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab); m_pFromDateEdit = new TQDateEdit(m_pSearchTab); - m_pFromDateEdit->setDate(TQDate::tqcurrentDate()); - tqlayout->addWidget(m_pEnableFromFilter,8,0); - tqlayout->addWidget(m_pFromDateEdit,8,1); + m_pFromDateEdit->setDate(TQDate::currentDate()); + layout->addWidget(m_pEnableFromFilter,8,0); + layout->addWidget(m_pFromDateEdit,8,1); connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool))); m_pFromDateEdit->setEnabled(false); m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab); m_pToDateEdit = new TQDateEdit(m_pSearchTab); - m_pToDateEdit->setDate(TQDate::tqcurrentDate()); - tqlayout->addWidget(m_pEnableToFilter,9,0); - tqlayout->addWidget(m_pToDateEdit,9,1); + m_pToDateEdit->setDate(TQDate::currentDate()); + layout->addWidget(m_pEnableToFilter,9,0); + layout->addWidget(m_pToDateEdit,9,1); connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool))); m_pToDateEdit->setEnabled(false); TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab); connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(pb,10,1); + layout->addWidget(pb,10,1); TQWidget *w = new TQWidget(m_pSearchTab); - w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); - tqlayout->addWidget(w,11,1); + w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + layout->addWidget(w,11,1); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); #ifdef COMPILE_USE_QT4 @@ -202,11 +202,11 @@ void KviLogViewMDIWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview"); - m_szHtmlActiveCaption = TQString("").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii()); + m_szHtmlActiveCaption = TQString("").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii()); m_szHtmlActiveCaption.append(m_szPlainTextCaption); m_szHtmlActiveCaption.append(""); - m_szHtmlInactiveCaption = TQString("").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii()); + m_szHtmlInactiveCaption = TQString("").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii()); m_szHtmlInactiveCaption.append(m_szPlainTextCaption); m_szHtmlInactiveCaption.append(""); } @@ -216,9 +216,9 @@ void KviLogViewMDIWindow::die() close(); } -TQSize KviLogViewMDIWindow::tqsizeHint() const +TQSize KviLogViewMDIWindow::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height()); + TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height()); return ret; } @@ -361,7 +361,7 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it) else outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp); } - m_pIrcView->tqrepaint(false); + m_pIrcView->repaint(false); } TQStringList KviLogViewMDIWindow::getFileNames() -- cgit v1.2.1