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, 18 insertions, 16 deletions

diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index d617fafd..7c10ff6d 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -46,15 +46,16 @@ class KompareListViewLineContainerItem;
 class KompareListView : public KListView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KompareListView( bool isSource, ViewSettings* settings, TQWidget* parent, const char* name = 0 );
+	KompareListView( bool isSource, ViewSettings* settings, TQWidget* tqparent, const char* name = 0 );
 	virtual ~KompareListView();
 
 	KompareListViewItem* itemAtIndex( int i );
 	int                  firstVisibleDifference();
 	int                  lastVisibleDifference();
-	TQRect                itemRect( int i );
+	TQRect                tqitemRect( int i );
 	int                  minScrollId();
 	int                  maxScrollId();
 	int                  contentsWidth();
@@ -102,12 +103,13 @@ private:
 	TQString                           m_spaces;
 };
 
-class KompareListViewFrame : public QFrame
+class KompareListViewFrame : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 	
 public:
-	KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
+	KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 );
 	virtual ~KompareListViewFrame() {};
 	KompareListView*     view() { return &m_view; };
 
@@ -120,13 +122,13 @@ private:
 	TQVBoxLayout          m_layout;
 };
 
-class KompareListViewItem : public QListViewItem
+class KompareListViewItem : public TQListViewItem
 {
 public:
-	KompareListViewItem( KompareListView* parent );
-	KompareListViewItem( KompareListView* parent, KompareListViewItem* after );
-	KompareListViewItem( KompareListViewItem* parent );
-	KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* after );
+	KompareListViewItem( KompareListView* tqparent );
+	KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after );
+	KompareListViewItem( KompareListViewItem* tqparent );
+	KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* after );
 
 	void paintFocus( TQPainter* p, const TQColorGroup& cg, const TQRect& r );
 	int scrollId() { return m_scrollId; };
@@ -142,8 +144,8 @@ private:
 class KompareListViewDiffItem : public KompareListViewItem
 {
 public:
-	KompareListViewDiffItem( KompareListView* parent, Diff2::Difference* difference );
-	KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Diff2::Difference* difference );
+	KompareListViewDiffItem( KompareListView* tqparent, Diff2::Difference* difference );
+	KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::Difference* difference );
 
 	void setup();
 	void setSelected( bool b );
@@ -165,7 +167,7 @@ private:
 class KompareListViewLineContainerItem : public KompareListViewItem
 {
 public:
-	KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource );
+	KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource );
 
 	void setup();
 	int maxHeight() { return 0; }
@@ -182,7 +184,7 @@ private:
 class KompareListViewLineItem : public KompareListViewItem
 {
 public:
-	KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, Diff2::DifferenceString* text );
+	KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, Diff2::DifferenceString* text );
 
 	virtual void setup();
 	int maxHeight() { return 0; }
@@ -199,7 +201,7 @@ private:
 class KompareListViewBlankLineItem : public KompareListViewLineItem
 {
 public:
-	KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent );
+	KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent );
 
 	void setup();
 
@@ -209,8 +211,8 @@ public:
 class KompareListViewHunkItem : public KompareListViewItem
 {
 public:
-	KompareListViewHunkItem( KompareListView* parent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
-	KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
+	KompareListViewHunkItem( KompareListView* tqparent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
+	KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
 
 	void setup();
 	void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );