TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 5 deletions

diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h
index afeb770f..3b7b6bff 100644
--- a/kompare/libdiff2/komparemodellist.h
+++ b/kompare/libdiff2/komparemodellist.h
@@ -38,11 +38,12 @@ class KompareProcess;
 namespace Diff2
 {
 
-class KompareModelList : public QObject
+class KompareModelList : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent = 0, const char* name = 0 );
+	KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent = 0, const char* name = 0 );
 	~KompareModelList();
 
 public:
@@ -87,11 +88,11 @@ public:
 	int appliedCount() const;
 
 	const DiffModel* modelAt( int i ) const { return *( m_models->at( i ) ); };
-	int              findModel( DiffModel* model ) const { return m_models->findIndex( model ); };
+	int              findModel( DiffModel* model ) const { return m_models->tqfindIndex( model ); };
 
 	bool isModified() const;
 
-	int currentModel() const      { return m_models->findIndex( m_selectedModel ); };
+	int currentModel() const      { return m_models->tqfindIndex( m_selectedModel ); };
 	int currentDifference() const { return m_selectedModel ? m_selectedModel->findDifference( m_selectedDifference ) : -1; };
 
 	const DiffModel* selectedModel() const       { return m_selectedModel; };
@@ -113,7 +114,7 @@ protected:
 	bool blendFile( DiffModel* model, const TQString& lines );
 
 signals:
-	void status( Kompare::Status status );
+	void status( Kompare::tqStatus status );
 	void setStatusBarModelInfo( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount );
 	void error( TQString error );
 	void modelsChanged( const Diff2::DiffModelList* models );