Rename a number of old tq methods that are no longer tq specific

8 files changed, 27 insertions, 27 deletions

diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 2413a88a..24413db6 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin
         cmd = Settings::terminalEmulatorName( *kapp->config() );
         if ( cmd == "konsole" && !directory.isNull() ) {  // isn't setting the working directory below enough?
           // If a directory was specified, use it
-          cmd += TQString(" --workdir '%1'").tqarg(directory);
+          cmd += TQString(" --workdir '%1'").arg(directory);
         }
         cmd += " -e /bin/sh -c '";
         cmd += program;
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 824a3f9e..5525f1f4 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -19,8 +19,8 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqclipboard.h>
+#include <textstream.h>
+#include <clipboard.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
 	if (row) {
 		if (assertMatch.exactMatch(row->text())) {
 			m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1);
-			m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000);
+			m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000);
 			m_part->mainWindow()->lowerView(this);
 
 		} else if (lineInfoMatch.search(row->text()) != -1) {
@@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
     if (isSelected(i))
       buffer += item(i)->text() + "\n";
   }
-  kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+  kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
 }
 
 void AppOutputWidget::addPartialStderrLine(const TQCString & line)
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 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index 9686f035..aa25057d 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -11,7 +11,7 @@
 
 #include "makeitem.h"
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -124,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
 	m_text = i18n("*** Compilation aborted ***");
 	if ( m_normalExit )
 		if (m_exitStatus )
-			m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus );
+			m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus );
         	else
 			m_text = i18n("*** Success ***");
 }
@@ -139,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true;
 TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Entering directory %1").tqarg( directory );
+		return i18n("Entering directory %1").arg( directory );
 	return m_text;
 }
 
 TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Leaving directory %1").tqarg( directory );
+		return i18n("Leaving directory %1").arg( directory );
 	return m_text;
 }
 
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 34618a97..e916d92c 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -37,10 +37,10 @@
 #include <tqapplication.h>
 #include <tqdir.h>
 #include <tqimage.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtimer.h>
 #include <tqfileinfo.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpopupmenu.h>
 #include <tqrichtext_p.h>
 
@@ -342,7 +342,7 @@ void MakeWidget::copy()
 	selection.replace("&quot;","\"");
 	selection.replace("&amp;","&");
 
-	kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
+	kapp->clipboard()->setText(selection, TQClipboard::Clipboard);
 }
 
 void MakeWidget::nextError()
@@ -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);
 		}
 	}
@@ -580,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *)
 	insertItem( item );
         displayPendingItem();
 
-	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(item->m_text), 3000);
+	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
 	m_part->core()->running(m_part, false);
 
 	// Defensive programming: We emit this with a single shot timer so that we go once again
@@ -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("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
+    pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>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("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
+    pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>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("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
+    pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>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("<b>Full compiler output</b><p>Displays unmodified compiler output."));
+    pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>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("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
+    pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
 	pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages());
 
 	return pMenu;
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index b97b16bb..4d627efc 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -14,7 +14,7 @@
 
 #include <tqptrstack.h>
 #include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqvaluevector.h>
 #include <tqintdict.h>