TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 34 insertions, 32 deletions

diff --git a/src/languages/language.h b/src/languages/language.h
index 68ef187..54fc408 100644
--- a/src/languages/language.h
+++ b/src/languages/language.h
@@ -11,8 +11,8 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 class FlowCodeDocument;
 class KTechlab;
@@ -23,9 +23,9 @@ class OutputMethodInfo;
 class ProcessChain;
 class ProcessOptions;
 class TextDocument;
-class QProcess;
+class TQProcess;
 
-typedef QValueList<ProcessOptions> ProcessOptionsList;
+typedef TQValueList<ProcessOptions> ProcessOptionsList;
 
 class ProcessOptionsSpecial
 {
@@ -34,26 +34,27 @@ class ProcessOptionsSpecial
 		
 		bool b_addToProject;
 		bool b_forceList;
-		QString m_picID;
+		TQString m_picID;
 		FlowCodeDocument * p_flowCodeDocument;
 		
 		// Linking
-		QString m_hexFormat;
+		TQString m_hexFormat;
 		bool m_bOutputMapFile;
-		QString m_libraryDir;
-		QString m_linkerScript;
-		QStringList m_linkLibraries;
-		QString m_linkOther;
+		TQString m_libraryDir;
+		TQString m_linkerScript;
+		TQStringList m_linkLibraries;
+		TQString m_linkOther;
 		
 		// Programming
-		QString m_port;
-		QString m_program;
+		TQString m_port;
+		TQString m_program;
 };
 
 
-class ProcessOptionsHelper : public QObject
+class ProcessOptionsHelper : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 #define protected public
 	signals:
 #undef protected
@@ -142,21 +143,21 @@ class ProcessOptions : public ProcessOptionsSpecial
 		 * Tries to guess the media type from the url (and possible the contents
 		 * of the file as well).
 		 */
-		static ProcessPath::MediaType guessMediaType( const QString & url );
+		static ProcessPath::MediaType guessMediaType( const TQString & url );
 		/**
 		 * The *final* target file (not any intermediatary ones)
 		 */
-		QString targetFile() const { return m_targetFile; }
+		TQString targetFile() const { return m_targetFile; }
 		/**
 		 * This sets the final target file, as well as the initial intermediatary one
 		 */
-		void setTargetFile( const QString &file );
+		void setTargetFile( const TQString &file );
 		
-		void setIntermediaryOutput( const QString &file ) { m_intermediaryFile = file; }
-		QString intermediaryOutput() const { return m_intermediaryFile; }
+		void setIntermediaryOutput( const TQString &file ) { m_intermediaryFile = file; }
+		TQString intermediaryOutput() const { return m_intermediaryFile; }
 		
-		void setInputFiles( const QStringList & files ) { m_inputFiles = files; }
-		QStringList inputFiles() const { return m_inputFiles; }
+		void setInputFiles( const TQStringList & files ) { m_inputFiles = files; }
+		TQStringList inputFiles() const { return m_inputFiles; }
 		
 		void setMethod( Method::type method ) { m_method = method; }
 		Method::type method() const { return m_method; }
@@ -174,7 +175,7 @@ class ProcessOptions : public ProcessOptionsSpecial
 		 * is not to be confused with setTextOutputtedTo, which is called once
 		 * the processing has finished, and will call-back to the slot given.
 		 */
-		void setTextOutputTarget( TextDocument * target, QObject * receiver, const char * slot );
+		void setTextOutputTarget( TextDocument * target, TQObject * receiver, const char * slot );
 		/**
 		 * @see setTextOutputTarget
 		 */
@@ -188,9 +189,9 @@ class ProcessOptions : public ProcessOptionsSpecial
 		TextDocument * m_pTextOutputTarget;
 		ProcessOptionsHelper * m_pHelper;
 		bool b_targetFileSet;
-		QStringList m_inputFiles;
-		QString m_targetFile;
-		QString m_intermediaryFile;
+		TQStringList m_inputFiles;
+		TQString m_targetFile;
+		TQString m_intermediaryFile;
 		Method::type m_method;
 		ProcessPath::Path m_processPath;
 };
@@ -200,11 +201,12 @@ class ProcessOptions : public ProcessOptionsSpecial
 @author Daniel Clarke
 @author David Saxton
 */
-class Language : public QObject
+class Language : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		Language( ProcessChain *processChain, KTechlab *parent, const QString &name );
+		Language( ProcessChain *processChain, KTechlab *tqparent, const TQString &name );
 		~Language();
 	
 		/**
@@ -239,15 +241,15 @@ class Language : public QObject
 		 * Examines the string for the line number if applicable, and creates a new
 		 * MessageInfo for it.
 		 */
-		virtual MessageInfo extractMessageInfo( const QString &text );
+		virtual MessageInfo extractMessageInfo( const TQString &text );
 	
 		/**
 		 * Reset the error count
 		 */
 		void reset();
-		void outputMessage( const QString &message );
-		void outputWarning( const QString &message );
-		void outputError( const QString &error );
+		void outputMessage( const TQString &message );
+		void outputWarning( const TQString &message );
+		void outputError( const TQString &error );
 		void finish( bool successful );
 	
 		int m_errorCount;
@@ -258,11 +260,11 @@ class Language : public QObject
 		/**
 		 * A message appropriate to the language's success after compilation or similar.
 		 */
-		QString m_successfulMessage;
+		TQString m_successfulMessage;
 		/**
 		 * A message appropriate to the language's failure after compilation or similar.
 		 */
-		QString m_failedMessage;
+		TQString m_failedMessage;
 };
 
 #endif