Fix kdesdk Qt3 FTBFS

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

1 files changed, 29 insertions, 29 deletions

diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index e962730a..99a96fc5 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -36,7 +36,7 @@ using namespace Diff2;
 
 KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * tqparent,
                                   const char *name) :
-	QSplitter(Qt::Horizontal, tqparent, name ),
+	KQSplitter(Qt::Horizontal, tqparent, name ),
 	m_settings( settings )
 {
 	TQFrame *scrollFrame = new TQFrame( tqparent, "scrollFrame" );
@@ -99,17 +99,17 @@ KompareSplitter::~KompareSplitter(){}
     \a prepend is TRUE, then recalcId() is very probably needed.)
 */
 
-QSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, bool prepend )
+KQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, bool prepend )
 {
 	/* This function is *not* a good place to make connections to and from
 	 * the KompareListView. Make them in the KompareListViewFrame constructor
 	 * instad - that way the connections get made upon creation, not upon the
 	 * next processing of the event queue. */
 
-	QSplitterLayoutStruct *s;
+	KQSplitterLayoutStruct *s;
 	KompareConnectWidgetFrame *newHandle = 0;
 	if ( d->list.count() > 0 ) {
-		s = new QSplitterLayoutStruct;
+		s = new KQSplitterLayoutStruct;
 		s->resizeMode = KeepSize;
 		TQString tmp = "qt_splithandle_";
 		tmp += w->name();
@@ -127,7 +127,7 @@ QSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, bool
 		else
 		    d->list.append( s );
 	}
-	s = new QSplitterLayoutStruct;
+	s = new KQSplitterLayoutStruct;
 	s->resizeMode = DefaultResizeMode;
 	s->wid = w;
 	s->isHandle = FALSE;
@@ -153,7 +153,7 @@ void KompareSplitter::childEvent( TQChildEvent *c )
 		if ( ((TQWidget*)c->child())->testWFlags( WType_TopLevel ) )
 			return;
 
-		QSplitterLayoutStruct *s = d->list.first();
+		KQSplitterLayoutStruct *s = d->list.first();
 		while ( s ) {
 			if ( s->wid == c->child() )
 				return;
@@ -162,10 +162,10 @@ void KompareSplitter::childEvent( TQChildEvent *c )
 		addWidget( (KompareListViewFrame*)c->child() );
 		recalc( isVisible() );
     } else if ( c->type() == TQEvent::ChildRemoved ) {
-		QSplitterLayoutStruct *prev = 0;
+		KQSplitterLayoutStruct *prev = 0;
 		if ( d->list.count() > 1 )
 			prev = d->list.at( 1 );  // yes, this is correct
-		QSplitterLayoutStruct *curr = d->list.first();
+		KQSplitterLayoutStruct *curr = d->list.first();
 		while ( curr ) {
 			if ( curr->wid == c->child() ) {
 			d->list.removeRef( curr );
@@ -218,7 +218,7 @@ static TQPoint bottomRight( TQWidget *w )
 
 void KompareSplitter::moveSplitter( TQCOORD p, int id )
 {
-	QSplitterLayoutStruct *s = d->list.at( id );
+	KQSplitterLayoutStruct *s = d->list.at( id );
 	int farMin;
 	int min;
 	int max;
@@ -259,7 +259,7 @@ void KompareSplitter::moveSplitter( TQCOORD p, int id )
 void KompareSplitter::doMove( bool backwards, int pos, int id, int delta,
                         bool mayCollapse, int* positions, int* widths )
 {
-	QSplitterLayoutStruct *s;
+	KQSplitterLayoutStruct *s;
 	TQWidget *w;
 	for ( ; id >= 0 && id < (int)d->list.count();
 			id = backwards ? id - delta : id + delta ) {
@@ -294,7 +294,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta,
 
 void KompareSplitter::slotSetSelection( const DiffModel* model, const Difference* diff )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 	{
 		if ( curr->isHandle )
@@ -314,7 +314,7 @@ void KompareSplitter::slotSetSelection( const DiffModel* model, const Difference
 
 void KompareSplitter::slotSetSelection( const Difference* diff )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( curr->isHandle )
 			((KompareConnectWidgetFrame*)
@@ -328,7 +328,7 @@ void KompareSplitter::slotSetSelection( const Difference* diff )
 
 void KompareSplitter::slotApplyDifference( bool apply )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			((KompareListViewFrame*)
@@ -338,7 +338,7 @@ void KompareSplitter::slotApplyDifference( bool apply )
 
 void KompareSplitter::slotApplyAllDifferences( bool apply )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			((KompareListViewFrame*)
@@ -349,7 +349,7 @@ void KompareSplitter::slotApplyAllDifferences( bool apply )
 
 void KompareSplitter::slotApplyDifference( const Difference* diff, bool apply )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			((KompareListViewFrame*)
@@ -359,7 +359,7 @@ void KompareSplitter::slotApplyDifference( const Difference* diff, bool apply )
 
 void KompareSplitter::slotDifferenceClicked( const Difference* diff )
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			((KompareListViewFrame*)
@@ -369,7 +369,7 @@ void KompareSplitter::slotDifferenceClicked( const Difference* diff )
 
 void KompareSplitter::slotConfigChanged()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() ) {
 		if ( !curr->isHandle )
 		{
@@ -385,7 +385,7 @@ void KompareSplitter::slotConfigChanged()
 
 void KompareSplitter::slotDelayedRepaintHandles()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		 if ( curr->isHandle )
 			((KompareConnectWidgetFrame*)curr->wid)->wid()->slotDelayedRepaint();
@@ -393,7 +393,7 @@ void KompareSplitter::slotDelayedRepaintHandles()
 
 void KompareSplitter::tqrepaintHandles()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( curr->isHandle )
 			((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint();
@@ -557,7 +557,7 @@ void KompareSplitter::slotUpdateVScrollValue()
  
 int KompareSplitter::scrollId()
 {
-	QSplitterLayoutStruct *curr = d->list.first();
+	KQSplitterLayoutStruct *curr = d->list.first();
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			return ((KompareListViewFrame*) curr->wid)->view()->scrollId();
@@ -566,7 +566,7 @@ int KompareSplitter::scrollId()
 
 int KompareSplitter::lineSpacing()
 {
-	QSplitterLayoutStruct *curr = d->list.first();
+	KQSplitterLayoutStruct *curr = d->list.first();
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( !curr->isHandle )
 			return ((KompareListViewFrame*)
@@ -576,7 +576,7 @@ int KompareSplitter::lineSpacing()
 
 int KompareSplitter::pageSize()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 	{
 		if ( !curr->isHandle )
@@ -590,7 +590,7 @@ int KompareSplitter::pageSize()
 
 bool KompareSplitter::needVScrollBar()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int pagesize = pageSize();
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 	{
@@ -607,7 +607,7 @@ bool KompareSplitter::needVScrollBar()
 int KompareSplitter::minVScrollId()
 {
 
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int min = -1;
 	int mSId;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
@@ -623,7 +623,7 @@ int KompareSplitter::minVScrollId()
 
 int KompareSplitter::maxVScrollId()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int max = 0;
 	int mSId;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
@@ -640,7 +640,7 @@ int KompareSplitter::maxVScrollId()
 
 bool KompareSplitter::needHScrollBar()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 	{
 		if( !curr->isHandle )
@@ -655,7 +655,7 @@ bool KompareSplitter::needHScrollBar()
 
 int KompareSplitter::maxHScrollId()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int max = 0;
 	int mHSId;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
@@ -673,7 +673,7 @@ int KompareSplitter::maxHScrollId()
 
 int KompareSplitter::maxContentsX()
 {
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int max = 0;
 	int mCX;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
@@ -695,7 +695,7 @@ int KompareSplitter::minVisibleWidth()
 	// despite the fact that *noone* has a pgright and pgleft key :P
 	// But we do have mousewheels with horizontal scrolling functionality,
 	// pressing shift and scrolling then goes left and right one page at the time
-	QSplitterLayoutStruct *curr;
+	KQSplitterLayoutStruct *curr;
 	int min = -1;
 	int vW;
 	for( curr = d->list.first(); curr; curr = d->list.next() )