TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 118 insertions, 118 deletions

diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index a21cf7db..1b314464 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -33,8 +33,8 @@ static const KDevPluginInfo data("kdevappoutputview");
 typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
 
-AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
+AppOutputViewPart::AppOutputViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevAppFrontend(&data, tqparent, name ? name : "AppOutputViewPart")
 {
     setInstance(AppViewFactory::instance());
 
@@ -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'").arg(directory);
+          cmd += TQString(" --workdir '%1'").tqarg(directory);
         }
         cmd += " -e /bin/sh -c '";
         cmd += program;
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index b0b0982a..bb26aad8 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -23,9 +23,10 @@ class AppOutputWidget;
 class AppOutputViewPart : public KDevAppFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & );
+    AppOutputViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~AppOutputViewPart();
 
     virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index c58065a2..89c3ced5 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -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").arg(assertMatch.cap(1)), 10000);
+			m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000);
 			m_part->mainWindow()->lowerView(this);
 
 		} else if (lineInfoMatch.search(row->text()) != -1) {
@@ -180,11 +180,11 @@ bool AppOutputWidget::filterSingleLine(const TQString & line)
 
 	if ( m_filter.m_isRegExp )
 	{
-		return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
+		return ( line.tqfind( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
 	}
 	else
 	{
-		return ( line.find( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
+		return ( line.tqfind( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
 	}	
 }
 
@@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
     if (isSelected(i))
       buffer += item(i)->text() + "\n";
   }
-  kapp->clipboard()->setText(buffer, QClipboard::Clipboard);
+  kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
 }
 
 void AppOutputWidget::addPartialStderrLine(const TQCString & line)
diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h
index 0673f106..7fbe35be 100644
--- a/parts/outputviews/appoutputwidget.h
+++ b/parts/outputviews/appoutputwidget.h
@@ -22,6 +22,7 @@ class AppOutputViewPart;
 class AppOutputWidget : public ProcessWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 friend class AppOutputViewPart;
 public:
     AppOutputWidget(AppOutputViewPart* part);
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index 9d48f1c8..c365d6cf 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -53,7 +53,7 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats()
 		// ld
 		ErrorFormat( "undefined reference", 0, 0, 0 ),
 		ErrorFormat( "undefined symbol", 0, 0, 0 ),
-		ErrorFormat( "ld: cannot find", 0, 0, 0 ),
+		ErrorFormat( "ld: cannot tqfind", 0, 0, 0 ),
 		ErrorFormat( "No such file", 0, 0, 0 ),
 		// make
  		ErrorFormat( "No rule to make target", 0, 0, 0 ),
@@ -98,9 +98,9 @@ void CompileErrorFilter::processLine( const TQString& line )
 			text    = regExp.cap( format->textGroup );
 			compiler = format->compiler;
 			TQString cap = regExp.cap(3);
-			if (cap.contains("warning:", false) || cap.contains("Warnung:", false))
+			if (cap.tqcontains("warning:", false) || cap.tqcontains("Warnung:", false))
 				isWarning = true;
-			if (regExp.cap(3).contains("instantiated from", false)) {
+			if (regExp.cap(3).tqcontains("instantiated from", false)) {
 				isInstantiationInfo = true;
 			}
 			break;
@@ -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::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
-			|| text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 )
+		if( text.tqfind( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+			|| text.tqfind( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
 		hasmatch = false;
 	}
 
diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h
index 2f67adaf..7a2fe1dc 100644
--- a/parts/outputviews/compileerrorfilter.h
+++ b/parts/outputviews/compileerrorfilter.h
@@ -22,6 +22,7 @@ class MakeItem;
 class CompileErrorFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	CompileErrorFilter( OutputFilter& );
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 02629797..9d110533 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -85,26 +85,26 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
 	//@todo: other translations!
 	
 	// we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-    static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
-	static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
+    // 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"));
     kdDebug(9004) << "Directory filter line " << line << endl;
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.find(en_e) > -1 ||
-	   line.find(fr_e) > -1 ||
-	   line.find(pl_e) > -1 ||
-	   line.find(ja_e) > -1 ||
-	   line.find(ko_e) > -1 ||
-	   line.find(ko_b) > -1 ||
-	   line.find(pt_br_e) > -1 ||
-	   line.find(ru_e) > -1 ||
-	   line.find(de_e1) > -1 ||
-	   line.find(de_e2) > -1 ||
-	   line.find(es_e) > -1 ||
-	   line.find(nl_e) > -1)
+	if(line.tqfind(en_e) > -1 ||
+	   line.tqfind(fr_e) > -1 ||
+	   line.tqfind(pl_e) > -1 ||
+	   line.tqfind(ja_e) > -1 ||
+	   line.tqfind(ko_e) > -1 ||
+	   line.tqfind(ko_b) > -1 ||
+	   line.tqfind(pt_br_e) > -1 ||
+	   line.tqfind(ru_e) > -1 ||
+	   line.tqfind(de_e1) > -1 ||
+	   line.tqfind(de_e2) > -1 ||
+	   line.tqfind(es_e) > -1 ||
+	   line.tqfind(nl_e) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1)
@@ -157,24 +157,24 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
 	static const TQString po_l("Opuszczam katalog");
 	
     // we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
 
-	static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
+	static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.find(en_l) > -1 ||
-	   line.find(fr_l) > -1 ||
-	   line.find(ja_l) > -1 ||
-	   (line.find(ko_l) > -1 && line.find(ko_b) > -1) ||
-	   line.find(pt_br_l) > -1 ||
-	   line.find(ru_l) > -1 ||
-	   line.find(de_l1) > -1 ||
-	   line.find(de_l2) > -1 ||
-	   line.find(es_l) > -1 ||
-	   line.find(nl_l) > -1 ||
-	   line.find(po_l) > -1)
+	if(line.tqfind(en_l) > -1 ||
+	   line.tqfind(fr_l) > -1 ||
+	   line.tqfind(ja_l) > -1 ||
+	   (line.tqfind(ko_l) > -1 && line.tqfind(ko_b) > -1) ||
+	   line.tqfind(pt_br_l) > -1 ||
+	   line.tqfind(ru_l) > -1 ||
+	   line.tqfind(de_l1) > -1 ||
+	   line.tqfind(de_l2) > -1 ||
+	   line.tqfind(es_l) > -1 ||
+	   line.tqfind(nl_l) > -1 ||
+	   line.tqfind(po_l) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1 )
diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h
index 0d57e52d..4abaa23e 100644
--- a/parts/outputviews/directorystatusmessagefilter.h
+++ b/parts/outputviews/directorystatusmessagefilter.h
@@ -21,6 +21,7 @@ class ExitingDirectoryItem;
 class DirectoryStatusMessageFilter :  public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	DirectoryStatusMessageFilter( OutputFilter& );
diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui
index 729af672..07e16d99 100644
--- a/parts/outputviews/filterdlg.ui
+++ b/parts/outputviews/filterdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FilterDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FilterDlg</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,14 +46,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -86,7 +86,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>filtergroup</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>caseSensitive</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>C&amp;ase sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>regularExpression</cstring>
                     </property>
@@ -160,5 +160,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 4edaae2b..ca3e843a 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -79,8 +79,8 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
 		ActionFormat( i18n("built"), 1, 1, "\\[.+%\\] Built target (.*)" ), //cmake
 		ActionFormat( i18n("generating"), 1, 1, "\\[.+%\\] Generating (.*)" ), //cmake
 
-                //moc and uic
-		ActionFormat( i18n("generating"), 1, 2, "/(moc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
+                //tqmoc and uic
+		ActionFormat( i18n("generating"), 1, 2, "/(tqmoc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
 		ActionFormat( i18n("generating"), 1, 2, "^generating (.*)" ), //unsermake
 
 		ActionFormat( i18n("linking"), "libtool", "/bin/sh\\s.*libtool.*--mode=link\\s.*\\s-o\\s([^\\s;]+)", 1 ),
@@ -96,7 +96,7 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
 		ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ),
 		ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake
 
-		ActionFormat( TQString::null, TQString::null, 0, 0 )
+		ActionFormat( TQString(), TQString(), 0, 0 )
 	};
 
 	return formats;
@@ -167,11 +167,11 @@ void MakeActionFilter::test()
 	static TQValueList<TestItem> testItems = TQValueList<TestItem>()
 
 	<< TestItem( // simple qmake compile
-		"g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
+		"g++ -c -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
 		"-I/home/john/src/kde/qt-copy/include -o test.o test.cpp",
 		"compiling", "g++", "test.cpp" )
 	<< TestItem( // simple qmake compile different option order
-		"g++ -c -o test.o -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
+		"g++ -c -o test.o -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
 		"-I/home/john/src/kde/qt-copy/include test.cpp",
 		"compiling", "g++", "test.cpp" )
 	<< TestItem( // simple qmake link
@@ -181,7 +181,7 @@ void MakeActionFilter::test()
 	<< TestItem( // automake 1.7, srcdir != builddir
 		"if /bin/sh ../../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. "
 		"-I/home/john/src/kde/kdevelop/lib/interfaces -I../.. -I/usr/local/kde/include -I/home/john/src/kde/qt-copy/include "
-		"-I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
+		"-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
 		"-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion "
 		"-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new "
 		"-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f "
@@ -193,7 +193,7 @@ void MakeActionFilter::test()
 		"if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/kdevelop/src -I.. -I/home/john/src/kde/kdevelop/lib/interfaces "
 		"-I/home/john/src/kde/kdevelop/lib/sourceinfo -I/home/john/src/kde/kdevelop/lib/util -I/home/john/src/kde/kdevelop/lib "
 		"-I/home/john/src/kde/kdevelop/lib/qextmdi/include -I/home/john/src/kde/kdevelop/lib/structure -I/usr/local/kde/include "
-		"-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor "
+		"-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor "
 		"-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi "
 		"-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security "
 		"-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -MT mainwindowideal.o -MD -MP -MF "
@@ -203,7 +203,7 @@ void MakeActionFilter::test()
 		"compiling", "g++", "mainwindowideal.cpp" )
 	<< TestItem( // automake and libtool compiling *.c files
 		"if /bin/sh ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces"
-		"-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT "
+		"-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT "
 		"-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings "
 		"-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g3 -fno-inline -Wformat-security -Wmissing-format-attribute -MT readtags.lo "
 		"-MD -MP -MF \".deps/readtags.Tpo\" -c -o readtags.lo readtags.c; then mv -f \".deps/readtags.Tpo\" "
@@ -213,7 +213,7 @@ void MakeActionFilter::test()
 		"source='makewidget.cpp' object='makewidget.lo' libtool=yes depfile='.deps/makewidget.Plo' "
 		"tmpdepfile='.deps/makewidget.TPlo' depmode=gcc3 /bin/sh ../../admin/depcomp /bin/sh ../../libtool --mode=compile "
 		"--tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces -I../../lib/util -I/opt/kde3/include "
-		"-I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef "
+		"-I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef "
 		"-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE "
 		"-Wcast-align -Wconversion -fno-builtin -g -O2 -g3 -O0 -fno-exceptions -fno-check-new -c -o makewidget.lo `test -f "
 		"'makewidget.cpp' || echo './'`makewidget.cpp",
@@ -233,7 +233,7 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
-		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
+		"kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
 		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
@@ -241,13 +241,13 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo "
-		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
+		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
 		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
 		"-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include  "
-		"-I../../quanta/dialogs  -DQT_THREAD_SUPPORT  -D_REENTRANT -DKOMMANDER -DDESIGNER -DQT_NO_SQL -DHAVE_KDE  -Wnon-virtual-dtor "
+		"-I../../quanta/dialogs  -DTQT_THREAD_SUPPORT  -D_REENTRANT -DKOMMANDER -DDESIGNER -DTQT_NO_SQL -DHAVE_KDE  -Wnon-virtual-dtor "
 		"-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE "
 		"-Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -DKDE_NO_COMPAT -fno-exceptions -fno-check-new -fno-common  -c -o project.o "
 		"`test -f '/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp' || "
@@ -272,14 +272,14 @@ void MakeActionFilter::test()
 	"quanta_init.cpp; "
 	"then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; "
 	"exit 1; fi",
-	"compiling", "g++", "quanta_init.cpp")
+	"compiling", "g++", "tquanta_init.cpp")
 	<< TestItem( //libtool, automake 1.8, file with full path
 	"if g++ -DHAVE_CONFIG_H -I. -I/home/andris/  "
 	"-DBUILD_KAFKAPART  -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o quanta_init.o "
 	"/home/andris/quanta_init.cpp; "
 	"then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; "
 	"exit 1; fi",
-	"compiling", "g++", "quanta_init.cpp")
+	"compiling", "g++", "tquanta_init.cpp")
 	;
 
 	TQValueList<TestItem>::const_iterator it = testItems.begin();
diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h
index 4f3a0e68..1809c74d 100644
--- a/parts/outputviews/makeactionfilter.h
+++ b/parts/outputviews/makeactionfilter.h
@@ -23,6 +23,7 @@ class ActionItem;
 class MakeActionFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 #ifdef DEBUG
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index 218bb894..fe1f8424 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -84,12 +84,8 @@ TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
 
 TQString MakeItem::br()
 {
-    // Qt >= 3.1 doesn't need a <br>.
-#if QT_VERSION < 0x040000
-    static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>";
-#else
+    // TQt >= 3.1 doesn't need a <br>.
     static const TQString br;
-#endif
     return br;
 }
 
@@ -128,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 ***").arg( m_exitStatus );
+			m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus );
         	else
 			m_text = i18n("*** Success ***");
 }
@@ -143,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true;
 TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Entering directory %1").arg( directory );
+		return i18n("Entering directory %1").tqarg( directory );
 	return m_text;
 }
 
 TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Leaving directory %1").arg( directory );
+		return i18n("Leaving directory %1").tqarg( directory );
 	return m_text;
 }
 
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 7c9dcb79..cd98a3e2 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -30,8 +30,8 @@ static const KDevPluginInfo data("kdevmakeview");
 typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
 
-MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevMakeFrontend(&data, parent, name)
+MakeViewPart::MakeViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevMakeFrontend(&data, tqparent, name)
 {
     setInstance(MakeViewFactory::instance());
 
@@ -52,11 +52,11 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages"));
 
     KAction *action;
-    action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()),
+    action = new KAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()),
                           actionCollection(), "view_next_error");
     action->setToolTip( i18n("Go to the next error") );
     action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from."));
-    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()),
+    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()),
                           actionCollection(), "view_previous_error");
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from."));
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 808a9208..0d70edaf 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -23,9 +23,10 @@ class MakeWidget;
 class MakeViewPart : public KDevMakeFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MakeViewPart( TQObject *parent, const char *name, const TQStringList & );
+    MakeViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~MakeViewPart();
     virtual TQWidget* widget();
     virtual void updateSettingsFromConfig();
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 3ccc4608..b7d5ed2f 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -42,7 +42,7 @@
 #include <tqfileinfo.h>
 #include <tqclipboard.h>
 #include <tqpopupmenu.h>
-#include <private/qrichtext_p.h>
+#include <private/tqrichtext_p.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -162,7 +162,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 {
 	updateSettingsFromConfig();
 
-	setTextFormat( Qt::RichText );
+	setTextFormat( TQt::RichText );
 
 	if ( m_bLineWrapping )
 		setWordWrap(WidgetWidth);
@@ -178,7 +178,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 
         dirstack.setAutoDelete(true);
 
-	childproc = new KProcess(this);
+	childproc = new KProcess(TQT_TQOBJECT(this));
 	procLineMaker = new ProcessLineMaker( childproc );
 
 	connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
@@ -247,20 +247,20 @@ void MakeWidget::startNextJob()
 	currentCommand = *it;
 	commandList.remove(it);
 
-	int i = currentCommand.findRev(" gmake");
+	int i = currentCommand.tqfindRev(" gmake");
 	if ( i == -1 )
-		i = currentCommand.findRev(" make");
+		i = currentCommand.tqfindRev(" make");
 	if ( i == -1 )
 		m_bCompiling = false;
 	else
 	{
 		TQString s = currentCommand.right(currentCommand.length() - i);
-		if ( s.contains("configure ")        ||
-		     s.contains(" Makefile.cvs")     ||
-		     s.contains(" clean")            ||
-		     s.contains(" distclean")        ||
-		     s.contains(" package-messages") ||
-		     s.contains(" install") )
+		if ( s.tqcontains("configure ")        ||
+		     s.tqcontains(" Makefile.cvs")     ||
+		     s.tqcontains(" clean")            ||
+		     s.tqcontains(" distclean")        ||
+		     s.tqcontains(" package-messages") ||
+		     s.tqcontains(" install") )
 		{
 		    m_bCompiling = false;
 		}
@@ -337,12 +337,12 @@ void MakeWidget::copy()
 	  selection.remove((selection.length()-1) -  removeend, removeend);
 	}
 
-	selection.replace("&lt;","<");
-	selection.replace("&gt;",">");
-	selection.replace("&quot;","\"");
-	selection.replace("&amp;","&");
+	selection.tqreplace("&lt;","<");
+	selection.tqreplace("&gt;",">");
+	selection.tqreplace("&quot;","\"");
+	selection.tqreplace("&amp;","&");
 
-	kapp->clipboard()->setText(selection, QClipboard::Clipboard);
+	kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
 }
 
 void MakeWidget::nextError()
@@ -378,11 +378,7 @@ void MakeWidget::prevError()
         if (m_lastErrorSelected != -1)
         {
             m_lastErrorSelected = -1;
-#if QT_VERSION >= 0x030100
             parag = (int)m_items.count();
-#else
-            parag = m_items.size();
-#endif
             if (!scanErrorBackward(parag))
                 KNotifyClient::beep();
         }
@@ -393,7 +389,7 @@ void MakeWidget::prevError()
 void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e )
 {
 	TQTextEdit::contentsMouseReleaseEvent(e);
-	if ( e->button() != LeftButton )
+	if ( e->button() != Qt::LeftButton )
 		return;
 	searchItem(paragraphAt(e->pos()));
 }
@@ -413,9 +409,9 @@ void MakeWidget::keyPressEvent(TQKeyEvent *e)
 // returns the current directory for parag
 TQString MakeWidget::directory(int parag) const
 {
-	TQValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
+	TQValueVector<MakeItem*>::const_iterator it = tqFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
 	if ( it == m_items.end() )
-		return TQString::null;
+		return TQString();
 	// run backwards over directories and figure out where we are
 	while ( it != m_items.begin() ) {
 		--it;
@@ -423,7 +419,7 @@ TQString MakeWidget::directory(int parag) const
 		if ( edi )
 			return edi->directory + "/";
 	}
-	return TQString::null;
+	return TQString();
 }
 
 // hackish function that will return true and put string "file" in "fName" if the file
@@ -457,7 +453,7 @@ void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const
     TQStringList files = m_part->project()->allFiles();
     for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it)
     {
-        if( (*it).contains( file ) )
+        if( (*it).tqcontains( file ) )
         {
             fName = URLUtil::canonicalPath( m_part->project()->projectDirectory() + "/" + *it );
         }
@@ -570,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *)
 	{
 		if (childproc->exitStatus())
 		{
-			KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
+			KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
 			emit m_part->commandFailed(currentCommand);
 		}
 		else
 		{
-			KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
+			KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
 			emit m_part->commandFinished(currentCommand);
 		}
 	}
@@ -584,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *)
 	insertItem( item );
         displayPendingItem();
 
-	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
+	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(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
@@ -692,7 +688,7 @@ void MakeWidget::insertItem( MakeItem* new_item )
 bool MakeWidget::brightBg()
 {
 	int h,s,v;
-	paletteBackgroundColor().hsv( &h, &s, &v );
+	TQColor(paletteBackgroundColor()).hsv( &h, &s, &v );
 	return (v > 127);
 }
 
@@ -704,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->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
+    pMenu->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
+    pMenu->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
+    pMenu->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
+    pMenu->tqsetWhatsThis(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->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
+    pMenu->tqsetWhatsThis(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;
@@ -756,9 +752,9 @@ void MakeWidget::refill()
 
 }
 
-void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eVeryShort); }
-void MakeWidget::slotShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eShort); }
-void MakeWidget::slotFullCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eFull);  }
+void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eVeryShort); }
+void MakeWidget::slotShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eShort); }
+void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eFull);  }
 
 void MakeWidget::setCompilerOutputLevel(EOutputLevel level)
 {
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index bdc7d451..dd8b2b63 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -34,9 +34,10 @@ class KURL;
 
 namespace KTextEditor { class Document; }
 
-class MakeWidget : public QTextEdit
+class MakeWidget : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MakeWidget(MakeViewPart *part);
diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h
index 3494de84..57b8f643 100644
--- a/parts/outputviews/otherfilter.h
+++ b/parts/outputviews/otherfilter.h
@@ -21,6 +21,7 @@ class MakeItem;
 class OtherFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	OtherFilter();