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

1 files changed, 9 insertions, 9 deletions

diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 20ab2cd9..9ae51f19 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -56,16 +56,16 @@ static const char* const bookmark_xpm[]={
 
 }
 
-class BookmarkItem : public QListViewItem
+class BookmarkItem : public TQListViewItem
 {
 public:
-	BookmarkItem( TQListView * parent, KURL const & url )
-			: TQListViewItem( parent, url.fileName() ),
+	BookmarkItem( TQListView * tqparent, KURL const & url )
+			: TQListViewItem( tqparent, url.fileName() ),
 			_url( url ), _line( -1 ), _isBookmark( false )
 	{}
 
-	BookmarkItem( TQListViewItem * parent, KURL const & url, QPair<int,TQString> mark )
-			: TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ),
+	BookmarkItem( TQListViewItem * tqparent, KURL const & url, TQPair<int,TQString> mark )
+			: TQListViewItem( tqparent, TQString::number( mark.first +1 ).rightJustify( 5 ) ),
 			_url( url ), _line( mark.first ), _isBookmark( true ) 
 	{
 		BookmarksWidget * lv = static_cast<BookmarksWidget*>( listView() );
@@ -143,7 +143,7 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part)
 		_part( part )
 
 {
-	addColumn( TQString::null );
+	addColumn( TQString() );
 	header()->hide();
 	setRootIsDecorated( true );
 	setResizeMode( TQListView::LastColumn );
@@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p)
 	if ( ! _part->config()->toolTip() ) return;
 
 	BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) );
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if ( item && r.isValid() )
 	{
@@ -196,7 +196,7 @@ void BookmarksWidget::updateURL( EditorData * data )
 {
 //	kdDebug(0) << "BookmarksWidget::updateURL()" << endl;
 
-	// remove the node that contains 'data'
+	// remove the node that tqcontains 'data'
 	removeURL( data->url );
 
 	// create it again with new data
@@ -213,7 +213,7 @@ void BookmarksWidget::createURL( EditorData * data )
 		file->setOpen( true );
 		file->setPixmap( 0, SmallIcon( "document" ) );
 
-		TQValueListIterator< QPair<int,TQString> > it = data->marks.begin();
+		TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 		while ( it != data->marks.end() )
 		{
 			TQListViewItem * item = new BookmarkItem( file, data->url, *it );