From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: 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 --- vcs/cvsservice/annotateview.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'vcs/cvsservice/annotateview.cpp') diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index afc185cd..30e80a21 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -25,14 +25,14 @@ #include "annotatepage.h" -class AnnotateViewItem : public QListViewItem +class AnnotateViewItem : public TQListViewItem { friend class AnnotateView; public: enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn }; - AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, + AnnotateViewItem(AnnotateView *tqparent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber); @@ -57,10 +57,10 @@ private: const int AnnotateViewItem::BORDER = 4; -AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, +AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber) - : TQListViewItem(parent) + : TQListViewItem(tqparent) , m_revision(rev) , m_author(author) , m_content(content) @@ -96,7 +96,7 @@ TQString AnnotateViewItem::text(int col) const ; }; - return TQString::null; + return TQString(); } @@ -140,22 +140,22 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col /*****************Definition of class AnnotateView ****************************/ /******************************************************************************/ -AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) - : KListView(parent, name), TQToolTip( viewport() ), - m_page(parent) +AnnotateView::AnnotateView(AnnotatePage *tqparent, const char *name) + : KListView(tqparent, name), TQToolTip( viewport() ), + m_page(tqparent) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); setShowToolTips(false); header()->hide(); - addColumn(TQString::null); - addColumn(TQString::null); - addColumn(TQString::null); - addColumn(TQString::null); + addColumn(TQString()); + addColumn(TQString()); + addColumn(TQString()); + addColumn(TQString()); setSorting(AnnotateViewItem::LineNumberColumn); - setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight); + setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemClicked(TQListViewItem*)) ); @@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date, } -TQSize AnnotateView::sizeHint() const +TQSize AnnotateView::tqsizeHint() const { TQFontMetrics fm(fontMetrics()); return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing()); @@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p ) return; } - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); //get the dimension of the author + the date column TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn); headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn)); -- cgit v1.2.3