From c3b301575a98e4c3505ad95534d6192b65539dab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:08 -0600 Subject: Rename old tq methods that no longer need a unique name --- parts/outputviews/compileerrorfilter.cpp | 4 ++-- parts/outputviews/directorystatusmessagefilter.cpp | 6 +++--- parts/outputviews/filterdlg.ui | 2 +- parts/outputviews/makewidget.cpp | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'parts/outputviews') diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp index 626187ca..efff1e1b 100644 --- a/parts/outputviews/compileerrorfilter.cpp +++ b/parts/outputviews/compileerrorfilter.cpp @@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line ) if( hasmatch ) { // Add hacks for error strings you want excluded here - if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0 - || text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 ) + if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0 + || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 ) hasmatch = false; } diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp index cde1d552..114b98ac 100644 --- a/parts/outputviews/directorystatusmessagefilter.cpp +++ b/parts/outputviews/directorystatusmessagefilter.cpp @@ -87,8 +87,8 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString // we need a TQRegExp because KRegExp is not Utf8 aware. // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); - static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); + static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory")); kdDebug(9004) << "Directory filter line " << line << endl; // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, @@ -160,7 +160,7 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index 4faa7f58..6a315a70 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -46,7 +46,7 @@ Expanding - + 20 20 diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 34618a97..f483ad7a 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -566,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *) { if (childproc->exitStatus()) { - KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); + KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); emit m_part->commandFailed(currentCommand); } else { - KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); + KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); emit m_part->commandFinished(currentCommand); } } @@ -700,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->insertSeparator(); int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); - pMenu->tqsetWhatsThis(id, i18n("Line wrapping

Enables or disables wrapping of command lines displayed.")); + pMenu->setWhatsThis(id, i18n("Line wrapping

Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("Very short compiler output

Displays only warnings, errors and the file names which are compiled.")); + pMenu->setWhatsThis(id, i18n("Very short compiler output

Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("Short compiler output

Suppresses all the compiler flags and formats to something readable.")); + pMenu->setWhatsThis(id, i18n("Short compiler output

Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("Full compiler output

Displays unmodified compiler output.")); + pMenu->setWhatsThis(id, i18n("Full compiler output

Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); - pMenu->tqsetWhatsThis(id, i18n("Show directory navigation messages

Shows cd commands that are executed while building.")); + pMenu->setWhatsThis(id, i18n("Show directory navigation messages

Shows cd commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); return pMenu; -- cgit v1.2.3