From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: Port kdesvn to TQt4 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/svnfrontend/graphtree/drawparams.cpp | 92 ++++---- src/svnfrontend/graphtree/drawparams.h | 72 +++--- src/svnfrontend/graphtree/elogentry.cpp | 2 +- src/svnfrontend/graphtree/elogentry.h | 4 +- src/svnfrontend/graphtree/graphtreelabel.cpp | 70 +++--- src/svnfrontend/graphtree/graphtreelabel.h | 44 ++-- src/svnfrontend/graphtree/pannerview.cpp | 34 +-- src/svnfrontend/graphtree/pannerview.h | 21 +- src/svnfrontend/graphtree/revgraphview.cpp | 326 +++++++++++++-------------- src/svnfrontend/graphtree/revgraphview.h | 71 +++--- src/svnfrontend/graphtree/revisiontree.cpp | 94 ++++---- src/svnfrontend/graphtree/revisiontree.h | 28 +-- src/svnfrontend/graphtree/revtreewidget.cpp | 54 ++--- src/svnfrontend/graphtree/revtreewidget.h | 37 +-- 14 files changed, 476 insertions(+), 473 deletions(-) (limited to 'src/svnfrontend/graphtree') diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index ced7bd4..74e4953 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -19,16 +19,16 @@ /* * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -52,12 +52,12 @@ StoredDrawParams::StoredDrawParams() _shaded = true; _rotated = false; - _backColor = Qt::white; + _backColor = TQt::white; // field array has size 0 } -StoredDrawParams::StoredDrawParams(QColor c, +StoredDrawParams::StoredDrawParams(TQColor c, bool selected, bool current) { _backColor = c; @@ -71,18 +71,18 @@ StoredDrawParams::StoredDrawParams(QColor c, // field array has size 0 } -QString StoredDrawParams::text(int f) const +TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QString::null; + return TQString(); return _field[f].text; } -QPixmap StoredDrawParams::pixmap(int f) const +TQPixmap StoredDrawParams::pixmap(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QPixmap(); + return TQPixmap(); return _field[f].pix; } @@ -103,10 +103,10 @@ int StoredDrawParams::maxLines(int f) const return _field[f].maxLines; } -const QFont& StoredDrawParams::font() const +const TQFont& StoredDrawParams::font() const { - static QFont* f = 0; - if (!f) f = new QFont(QApplication::font()); + static TQFont* f = 0; + if (!f) f = new TQFont(TQApplication::font()); return *f; } @@ -126,7 +126,7 @@ void StoredDrawParams::ensureField(int f) } -void StoredDrawParams::setField(int f, QString t, QPixmap pm, +void StoredDrawParams::setField(int f, TQString t, TQPixmap pm, Position p, int maxLines) { if (f<0 || f>=MAX_FIELD) return; @@ -138,7 +138,7 @@ void StoredDrawParams::setField(int f, QString t, QPixmap pm, _field[f].maxLines = maxLines; } -void StoredDrawParams::setText(int f, QString t) +void StoredDrawParams::setText(int f, TQString t) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -146,7 +146,7 @@ void StoredDrawParams::setText(int f, QString t) _field[f].text = t; } -void StoredDrawParams::setPixmap(int f, QPixmap pm) +void StoredDrawParams::setPixmap(int f, TQPixmap pm) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -176,7 +176,7 @@ void StoredDrawParams::setMaxLines(int f, int m) // RectDrawing // -RectDrawing::RectDrawing(QRect r) +RectDrawing::RectDrawing(TQRect r) { _fm = 0; _dp = 0; @@ -205,7 +205,7 @@ void RectDrawing::setDrawParams(DrawParams* dp) _dp = dp; } -void RectDrawing::setRect(QRect r) +void RectDrawing::setRect(TQRect r) { _rect = r; @@ -219,7 +219,7 @@ void RectDrawing::setRect(QRect r) _fontHeight = 0; } -QRect RectDrawing::remainingRect(DrawParams* dp) +TQRect RectDrawing::remainingRect(DrawParams* dp) { if (!dp) dp = drawParams(); @@ -244,20 +244,20 @@ QRect RectDrawing::remainingRect(DrawParams* dp) } -void RectDrawing::drawBack(QPainter* p, DrawParams* dp) +void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) { if (!dp) dp = drawParams(); if (_rect.width()<=0 || _rect.height()<=0) return; - QRect r = _rect; - QColor normal = dp->backColor(); + TQRect r = _rect; + TQColor normal = dp->backColor(); if (dp->selected()) normal = normal.light(); bool isCurrent = dp->current(); if (dp->drawFrame() || isCurrent) { // 3D raised/sunken frame effect... - QColor high = normal.light(); - QColor low = normal.dark(); + TQColor high = normal.light(); + TQColor low = normal.dark(); p->setPen( isCurrent ? low:high); p->drawLine(r.left(), r.top(), r.right(), r.top()); p->drawLine(r.left(), r.top(), r.left(), r.bottom()); @@ -270,10 +270,10 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) if (dp->shaded()) { // some shading - bool goDark = qGray(normal.rgb())>128; + bool goDark = tqGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); - p->setBrush(QBrush::NoBrush); + p->setBrush(TQBrush::NoBrush); // shade parameters: int d = 7; @@ -294,7 +294,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) int gDiff = goDark ? -gBase/d : (255-gBase)/d; int bDiff = goDark ? -bBase/d : (255-bBase)/d; - QColor shadeColor; + TQColor shadeColor; while (factor<.95) { shadeColor.setRgb((int)(rBase+factor*rDiff+.5), (int)(gBase+factor*gDiff+.5), @@ -333,22 +333,22 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) } // fill inside - p->setPen(QPen::NoPen); + p->setPen(TQPen::NoPen); p->setBrush(normal); p->drawRect(r); } -bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) +bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) { if (!dp) dp = drawParams(); if (!_fm) { - _fm = new QFontMetrics(dp->font()); + _fm = new TQFontMetrics(dp->font()); _fontHeight = _fm->height(); } - QRect r = _rect; + TQRect r = _rect; if (0) kdDebug(90100) << "DrawField: Rect " << r.x() << "/" << r.y() << " - " << r.width() << "x" << r.height() << endl; @@ -488,9 +488,9 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) // get text and pixmap now, only if we need to, because it is possible // that they are calculated on demand (and this can take some time) - QString name = dp->text(f); + TQString name = dp->text(f); if (name.isEmpty()) return 0; - QPixmap pix = dp->pixmap(f); + TQPixmap pix = dp->pixmap(f); // check if pixmap can be drawn int pixW = pix.width(); @@ -529,7 +529,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) } p->save(); - p->setPen( (qGray(dp->backColor().rgb())>100) ? Qt::black : Qt::white); + p->setPen( (tqGray(dp->backColor().rgb())>100) ? TQt::black : TQt::white); p->setFont(dp->font()); if (rotate) { //p->translate(r.x()+2, r.y()+r.height()); @@ -552,14 +552,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) * If the text is to be written at the bottom, we start with the * end of the string (so everything is reverted) */ - QString remaining; + TQString remaining; int origLines = lines; while (lines>0) { if (w>width && lines>1) { int lastBreakPos = name.length(), lastWidth = w; int len = name.length(); - QChar::Category caOld, ca; + TQChar::Category caOld, ca; if (!isBottom) { // start with comparing categories of last 2 chars @@ -569,8 +569,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) ca = name[len-1].category(); if (ca != caOld) { // "Aa" has no break between... - if (ca == QChar::Letter_Uppercase && - caOld == QChar::Letter_Lowercase) { + if (ca == TQChar::Letter_Uppercase && + caOld == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -584,7 +584,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.mid(lastBreakPos); // remove space on break point - if (name[lastBreakPos-1].category() == QChar::Separator_Space) + if (name[lastBreakPos-1].category() == TQChar::Separator_Space) name = name.left(lastBreakPos-1); else name = name.left(lastBreakPos); @@ -598,8 +598,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) if (ca != caOld) { // "Aa" has no break between... - if (caOld == QChar::Letter_Uppercase && - ca == QChar::Letter_Lowercase) { + if (caOld == TQChar::Letter_Uppercase && + ca == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -613,14 +613,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.left(l-lastBreakPos); // remove space on break point - if (name[l-lastBreakPos].category() == QChar::Separator_Space) + if (name[l-lastBreakPos].category() == TQChar::Separator_Space) name = name.right(lastBreakPos-1); else name = name.right(lastBreakPos); } } else - remaining = QString::null; + remaining = TQString(); /* truncate and add ... if needed */ if (w>width) { @@ -659,7 +659,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) p->drawText( x+pixW, y, width - pixW, h, - Qt::AlignLeft, name); + TQt::AlignLeft, name); y = isBottom ? (y-h) : (y+h); lines--; diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h index 4898111..eee2445 100644 --- a/src/svnfrontend/graphtree/drawparams.h +++ b/src/svnfrontend/graphtree/drawparams.h @@ -19,7 +19,7 @@ /** * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. * * This file defines the following classes: * DrawParams, RectDrawing, TreeMapItem, TreeMapWidget @@ -31,17 +31,17 @@ #ifndef DRAWPARAMS_H #define DRAWPARAMS_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -class QPopupMenu; -class QString; +class TQPopupMenu; +class TQString; class KConfigGroup; @@ -71,15 +71,15 @@ public: // no constructor as this is an abstract class virtual ~DrawParams() {} - virtual QString text(int) const = 0; - virtual QPixmap pixmap(int) const = 0; + virtual TQString text(int) const = 0; + virtual TQPixmap pixmap(int) const = 0; virtual Position position(int) const = 0; // 0: no limit, negative: leave at least -maxLines() free virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual QColor backColor() const { return Qt::white; } - virtual const QFont& font() const = 0; + virtual TQColor backColor() const { return TQt::white; } + virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } virtual bool current() const { return false; } @@ -96,33 +96,33 @@ class StoredDrawParams: public DrawParams { public: StoredDrawParams(); - StoredDrawParams(QColor c, + StoredDrawParams(TQColor c, bool selected = false, bool current = false); // getters - QString text(int) const; - QPixmap pixmap(int) const; + TQString text(int) const; + TQPixmap pixmap(int) const; Position position(int) const; int maxLines(int) const; int fieldCount() const { return _field.size(); } - QColor backColor() const { return _backColor; } + TQColor backColor() const { return _backColor; } bool selected() const { return _selected; } bool current() const { return _current; } bool shaded() const { return _shaded; } bool rotated() const { return _rotated; } bool drawFrame() const { return _drawFrame; } - const QFont& font() const; + const TQFont& font() const; // attribute setters - void setField(int f, QString t, QPixmap pm = QPixmap(), + void setField(int f, TQString t, TQPixmap pm = TQPixmap(), Position p = Default, int maxLines = 0); - void setText(int f, QString); - void setPixmap(int f, QPixmap); + void setText(int f, TQString); + void setPixmap(int f, TQPixmap); void setPosition(int f, Position); void setMaxLines(int f, int); - void setBackColor(QColor c) { _backColor = c; } + void setBackColor(TQColor c) { _backColor = c; } void setSelected(bool b) { _selected = b; } void setCurrent(bool b) { _current = b; } void setShaded(bool b) { _shaded = b; } @@ -130,7 +130,7 @@ public: void drawFrame(bool b) { _drawFrame = b; } protected: - QColor _backColor; + TQColor _backColor; bool _selected :1; bool _current :1; bool _shaded :1; @@ -142,13 +142,13 @@ private: void ensureField(int f); struct Field { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Position pos; int maxLines; }; - QValueVector _field; + TQValueVector _field; }; @@ -164,7 +164,7 @@ private: class RectDrawing { public: - RectDrawing(QRect); + RectDrawing(TQRect); ~RectDrawing(); // The default DrawParams object used. @@ -172,28 +172,28 @@ public: // we take control over the given object (i.e. delete at destruction) void setDrawParams(DrawParams*); - // draw on a given QPainter, use this class as info provider per default - void drawBack(QPainter*, DrawParams* dp = 0); + // draw on a given TQPainter, use this class as info provider per default + void drawBack(TQPainter*, DrawParams* dp = 0); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(QPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = 0); // resets rectangle for free space - void setRect(QRect); + void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - QRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = 0); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; int _usedBottomLeft, _usedBottomCenter, _usedBottomRight; - QRect _rect; + TQRect _rect; // temporary int _fontHeight; - QFontMetrics* _fm; + TQFontMetrics* _fm; DrawParams* _dp; }; diff --git a/src/svnfrontend/graphtree/elogentry.cpp b/src/svnfrontend/graphtree/elogentry.cpp index 924332c..573476b 100644 --- a/src/svnfrontend/graphtree/elogentry.cpp +++ b/src/svnfrontend/graphtree/elogentry.cpp @@ -35,7 +35,7 @@ eLog_Entry::~eLog_Entry() { } -void eLog_Entry::addCopyTo(const QString¤t,const QString&target, +void eLog_Entry::addCopyTo(const TQString¤t,const TQString&target, svn_revnum_t target_rev,char _action,svn_revnum_t from_rev) { svn::LogChangePathEntry _entry; diff --git a/src/svnfrontend/graphtree/elogentry.h b/src/svnfrontend/graphtree/elogentry.h index 0fa63ef..3bcbabc 100644 --- a/src/svnfrontend/graphtree/elogentry.h +++ b/src/svnfrontend/graphtree/elogentry.h @@ -31,7 +31,7 @@ struct eLog_Entry : public svn::LogEntry eLog_Entry(const svn::LogEntry&); ~eLog_Entry(); - void addCopyTo(const QString&,const QString&,svn_revnum_t,char _action,svn_revnum_t fromRev=-1); - void addAction(const QString&,char _action); + void addCopyTo(const TQString&,const TQString&,svn_revnum_t,char _action,svn_revnum_t fromRev=-1); + void addAction(const TQString&,char _action); }; #endif diff --git a/src/svnfrontend/graphtree/graphtreelabel.cpp b/src/svnfrontend/graphtree/graphtreelabel.cpp index 9770fef..cf51c9b 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.cpp +++ b/src/svnfrontend/graphtree/graphtreelabel.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "graphtreelabel.h" #include "graphtree_defines.h" -#include +#include -GraphTreeLabel::GraphTreeLabel(const QString&text, const QString&_nodename,const QRect&r,QCanvas*c) - : QCanvasRectangle(r,c),StoredDrawParams() +GraphTreeLabel::GraphTreeLabel(const TQString&text, const TQString&_nodename,const TQRect&r,TQCanvas*c) + : TQCanvasRectangle(r,c),StoredDrawParams() { m_Nodename = _nodename; - m_SourceNode = QString::null; + m_SourceNode = TQString(); setText(0,text); setPosition(0, DrawParams::TopCenter); drawFrame(true); @@ -35,7 +35,7 @@ GraphTreeLabel::~GraphTreeLabel() { } -const QString&GraphTreeLabel::nodename()const +const TQString&GraphTreeLabel::nodename()const { return m_Nodename; } @@ -45,14 +45,14 @@ int GraphTreeLabel::rtti()const return GRAPHTREE_LABEL; } -void GraphTreeLabel::setBgColor(const QColor&c) +void GraphTreeLabel::setBgColor(const TQColor&c) { _backColor=c; } -void GraphTreeLabel::drawShape(QPainter& p) +void GraphTreeLabel::drawShape(TQPainter& p) { - QRect r = rect(); + TQRect r = rect(); /* p.setPen(blue); p.drawRect(r); @@ -65,23 +65,23 @@ void GraphTreeLabel::drawShape(QPainter& p) void GraphTreeLabel::setSelected(bool s) { - QCanvasRectangle::setSelected(s); + TQCanvasRectangle::setSelected(s); StoredDrawParams::setSelected(s); update(); } -const QString&GraphTreeLabel::source()const +const TQString&GraphTreeLabel::source()const { return m_SourceNode; } -void GraphTreeLabel::setSource(const QString&_s) +void GraphTreeLabel::setSource(const TQString&_s) { m_SourceNode=_s; } -GraphEdge::GraphEdge(QCanvas*c) - : QCanvasSpline(c) +GraphEdge::GraphEdge(TQCanvas*c) + : TQCanvasSpline(c) { } @@ -89,12 +89,12 @@ GraphEdge::~GraphEdge() { } -void GraphEdge::drawShape(QPainter& p) +void GraphEdge::drawShape(TQPainter& p) { p.drawPolyline(poly); } -QPointArray GraphEdge::areaPoints() const +TQPointArray GraphEdge::areaPoints() const { int minX = poly[0].x(), minY = poly[0].y(); int maxX = minX, maxY = minY; @@ -109,7 +109,7 @@ QPointArray GraphEdge::areaPoints() const if (poly[i].y() > maxY) maxY = poly[i].y(); if (0) qDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y()); } - QPointArray a = poly.copy(), b = poly.copy(); + TQPointArray a = poly.copy(), b = poly.copy(); if (minX == maxX) { a.translate(-2, 0); b.translate(2, 0); @@ -137,14 +137,14 @@ int GraphEdge::rtti()const return GRAPHTREE_LINE; } -GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_parent,QCanvas*c) - : QCanvasPolygon(c),_edge(_parent) +GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_tqparent,TQCanvas*c) + : TQCanvasPolygon(c),_edge(_tqparent) { } -void GraphEdgeArrow::drawShape(QPainter&p) +void GraphEdgeArrow::drawShape(TQPainter&p) { - QCanvasPolygon::drawShape(p); + TQCanvasPolygon::drawShape(p); } int GraphEdgeArrow::rtti()const @@ -158,10 +158,10 @@ GraphEdge*GraphEdgeArrow::edge() } /* taken from KCacheGrind project */ -QPixmap*GraphMark::_p=0; +TQPixmap*GraphMark::_p=0; -GraphMark::GraphMark(GraphTreeLabel*n,QCanvas*c) - : QCanvasRectangle(c) +GraphMark::GraphMark(GraphTreeLabel*n,TQCanvas*c) + : TQCanvasRectangle(c) { if (!_p) { @@ -169,27 +169,27 @@ GraphMark::GraphMark(GraphTreeLabel*n,QCanvas*c) float v1 = 130.0, v2 = 10.0, v = v1, f = 1.03; // calculate pix size - QRect r(0, 0, 30, 30); + TQRect r(0, 0, 30, 30); while (v>v2) { r.setRect(r.x()-d, r.y()-d, r.width()+2*d, r.height()+2*d); v /= f; } - _p = new QPixmap(r.size()); - _p->fill(Qt::white); - QPainter p(_p); - p.setPen(Qt::NoPen); + _p = new TQPixmap(r.size()); + _p->fill(TQt::white); + TQPainter p(_p); + p.setPen(TQt::NoPen); r.moveBy(-r.x(), -r.y()); while (v +#include /** @author Rajko Albrecht */ -class GraphTreeLabel : public QCanvasRectangle,StoredDrawParams +class GraphTreeLabel : public TQCanvasRectangle,StoredDrawParams { public: - GraphTreeLabel(const QString&,const QString&,const QRect&r,QCanvas*c); + GraphTreeLabel(const TQString&,const TQString&,const TQRect&r,TQCanvas*c); virtual ~GraphTreeLabel(); virtual int rtti()const; - virtual void drawShape(QPainter& p); + virtual void drawShape(TQPainter& p); - void setBgColor(const QColor&); + void setBgColor(const TQColor&); - const QString&nodename()const; - const QString&source()const; - void setSource(const QString&); + const TQString&nodename()const; + const TQString&source()const; + void setSource(const TQString&); virtual void setSelected(bool); protected: - QString m_Nodename; - QString m_SourceNode; + TQString m_Nodename; + TQString m_SourceNode; }; class GraphEdge; -class GraphEdgeArrow:public QCanvasPolygon +class GraphEdgeArrow:public TQCanvasPolygon { public: - GraphEdgeArrow(GraphEdge*,QCanvas*); + GraphEdgeArrow(GraphEdge*,TQCanvas*); GraphEdge*edge(); - virtual void drawShape(QPainter&); + virtual void drawShape(TQPainter&); virtual int rtti()const; private: @@ -62,28 +62,28 @@ private: }; /* line */ -class GraphEdge:public QCanvasSpline +class GraphEdge:public TQCanvasSpline { public: - GraphEdge(QCanvas*); + GraphEdge(TQCanvas*); virtual ~GraphEdge(); - virtual void drawShape(QPainter&); - QPointArray areaPoints() const; + virtual void drawShape(TQPainter&); + TQPointArray areaPoints() const; virtual int rtti()const; }; -class GraphMark:public QCanvasRectangle +class GraphMark:public TQCanvasRectangle { public: - GraphMark(GraphTreeLabel*,QCanvas*); + GraphMark(GraphTreeLabel*,TQCanvas*); virtual ~GraphMark(); virtual int rtti()const; - virtual bool hit(const QPoint&)const; + virtual bool hit(const TQPoint&)const; - virtual void drawShape(QPainter&); + virtual void drawShape(TQPainter&); private: - static QPixmap*_p; + static TQPixmap*_p; }; #endif diff --git a/src/svnfrontend/graphtree/pannerview.cpp b/src/svnfrontend/graphtree/pannerview.cpp index 5f14e82..c3a2586 100644 --- a/src/svnfrontend/graphtree/pannerview.cpp +++ b/src/svnfrontend/graphtree/pannerview.cpp @@ -18,46 +18,46 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "pannerview.h" -#include +#include -PannerView::PannerView(QWidget* parent, const char* name) - : QCanvasView(parent, name,WNoAutoErase | WStaticContents ) +PannerView::PannerView(TQWidget* tqparent, const char* name) + : TQCanvasView(tqparent, name,WNoAutoErase | WStaticContents ) { m_Moving = false; - viewport()->setBackgroundMode(Qt::NoBackground); - setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); + setBackgroundMode(TQt::NoBackground); } PannerView::~PannerView() { } -void PannerView::drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph) +void PannerView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph) { p->save(); - QCanvasView::drawContents(p,clipx,clipy,clipw,cliph); + TQCanvasView::drawContents(p,clipx,clipy,clipw,cliph); p->restore(); if (m_ZoomRect.isValid()) { p->setPen(red.dark()); p->drawRect(m_ZoomRect); p->setPen( red); - p->drawRect(QRect(m_ZoomRect.x()+1, m_ZoomRect.y()+1, + p->drawRect(TQRect(m_ZoomRect.x()+1, m_ZoomRect.y()+1, m_ZoomRect.width()-2, m_ZoomRect.height()-2)); } } -void PannerView::setZoomRect(const QRect& theValue) +void PannerView::setZoomRect(const TQRect& theValue) { - QRect oldRect = m_ZoomRect; + TQRect oldRect = m_ZoomRect; m_ZoomRect = theValue; updateContents(oldRect); updateContents(m_ZoomRect); } /*! - \fn PannerView::contentsMouseMoveEvent(QMouseEvent* e) + \fn PannerView::contentsMouseMoveEvent(TQMouseEvent* e) */ -void PannerView::contentsMouseMoveEvent(QMouseEvent* e) +void PannerView::contentsMouseMoveEvent(TQMouseEvent* e) { if (m_Moving) { emit zoomRectMoved(e->pos().x() - m_LastPos.x(), e->pos().y() - m_LastPos.y()); @@ -66,12 +66,12 @@ void PannerView::contentsMouseMoveEvent(QMouseEvent* e) } /*! - \fn PannerView::contentsMousePressEvent(QMouseEvent* e) + \fn PannerView::contentsMousePressEvent(TQMouseEvent* e) */ -void PannerView::contentsMousePressEvent(QMouseEvent* e) +void PannerView::contentsMousePressEvent(TQMouseEvent* e) { if (m_ZoomRect.isValid()) { - if (!m_ZoomRect.contains(e->pos())) { + if (!m_ZoomRect.tqcontains(e->pos())) { emit zoomRectMoved(e->pos().x() - m_ZoomRect.center().x(), e->pos().y() - m_ZoomRect.center().y()); } @@ -81,9 +81,9 @@ void PannerView::contentsMousePressEvent(QMouseEvent* e) } /*! - \fn PannerView::contentsMouseReleaseEvent(QMouseEvent*) + \fn PannerView::contentsMouseReleaseEvent(TQMouseEvent*) */ -void PannerView::contentsMouseReleaseEvent(QMouseEvent*) +void PannerView::contentsMouseReleaseEvent(TQMouseEvent*) { m_Moving = false; emit zoomRectMoveFinished(); diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h index 6c1a310..026488d 100644 --- a/src/svnfrontend/graphtree/pannerview.h +++ b/src/svnfrontend/graphtree/pannerview.h @@ -20,19 +20,20 @@ #ifndef PANNERVIEW_H #define PANNERVIEW_H -#include +#include /** @author Rajko Albrecht */ -class PannerView : public QCanvasView +class PannerView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - PannerView(QWidget* parent=0, const char* name=0); + PannerView(TQWidget* tqparent=0, const char* name=0); virtual ~PannerView(); - void setZoomRect(const QRect& theValue); + void setZoomRect(const TQRect& theValue); void updateCurrentRect(); signals: @@ -40,14 +41,14 @@ signals: void zoomRectMoveFinished(); protected: - virtual void drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph); - virtual void contentsMouseMoveEvent(QMouseEvent* e); - virtual void contentsMousePressEvent(QMouseEvent* e); - virtual void contentsMouseReleaseEvent(QMouseEvent*); + virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); + virtual void contentsMouseMoveEvent(TQMouseEvent* e); + virtual void contentsMousePressEvent(TQMouseEvent* e); + virtual void contentsMouseReleaseEvent(TQMouseEvent*); protected: - QRect m_ZoomRect; + TQRect m_ZoomRect; bool m_Moving; - QPoint m_LastPos; + TQPoint m_LastPos; }; #endif diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index cc85c0e..afb9d3a 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -46,38 +46,38 @@ #define LABEL_HEIGHT 90 -class GraphViewTip:public QToolTip +class GraphViewTip:public TQToolTip { public: - GraphViewTip( QWidget* p ):QToolTip(p) {} + GraphViewTip( TQWidget* p ):TQToolTip(p) {} virtual ~GraphViewTip(){} protected: - void maybeTip( const QPoint & ); + void maybeTip( const TQPoint & ); }; -void GraphViewTip::maybeTip( const QPoint & pos) +void GraphViewTip::maybeTip( const TQPoint & pos) { - if (!parentWidget()->inherits( "RevGraphView" )) return; - RevGraphView* cgv = (RevGraphView*)parentWidget(); - QPoint cPos = cgv->viewportToContents(pos); - QCanvasItemList l = cgv->canvas()->collisions(cPos); + if (!tqparentWidget()->inherits( "RevGraphView" )) return; + RevGraphView* cgv = (RevGraphView*)tqparentWidget(); + TQPoint cPos = cgv->viewportToContents(pos); + TQCanvasItemList l = cgv->canvas()->collisions(cPos); if (l.count() == 0) return; - QCanvasItem* i = l.first(); + TQCanvasItem* i = l.first(); if (i->rtti() == GRAPHTREE_LABEL) { GraphTreeLabel*tl = (GraphTreeLabel*)i; - QString nm = tl->nodename(); - QString tipStr = cgv->toolTip(nm); + TQString nm = tl->nodename(); + TQString tipStr = cgv->toolTip(nm); if (tipStr.length()>0) { - QPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); - QPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); - tip(QRect(vPosTL, vPosBR), tipStr); + TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); + TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); + tip(TQRect(vPosTL, vPosBR), tipStr); } } } -RevGraphView::RevGraphView(QObject*aListener,svn::Client*_client,QWidget * parent, const char * name, WFlags f) - : QCanvasView(parent,name,f) +RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * tqparent, const char * name, WFlags f) + : TQCanvasView(tqparent,name,f) { m_Canvas = 0L; m_Client = _client; @@ -88,16 +88,16 @@ RevGraphView::RevGraphView(QObject*aListener,svn::Client*_client,QWidget * paren m_Marker = 0; m_Tip = new GraphViewTip(this); m_CompleteView = new PannerView(this); - m_CompleteView->setVScrollBarMode(QScrollView::AlwaysOff); - m_CompleteView->setHScrollBarMode(QScrollView::AlwaysOff); + m_CompleteView->setVScrollBarMode(TQScrollView::AlwaysOff); + m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff); m_CompleteView->raise(); m_CompleteView->hide(); - connect(this, SIGNAL(contentsMoving(int,int)), - this, SLOT(contentsMovingSlot(int,int))); - connect(m_CompleteView, SIGNAL(zoomRectMoved(int,int)), - this, SLOT(zoomRectMoved(int,int))); - connect(m_CompleteView, SIGNAL(zoomRectMoveFinished()), - this, SLOT(zoomRectMoveFinished())); + connect(this, TQT_SIGNAL(contentsMoving(int,int)), + this, TQT_SLOT(contentsMovingSlot(int,int))); + connect(m_CompleteView, TQT_SIGNAL(zoomRectMoved(int,int)), + this, TQT_SLOT(zoomRectMoved(int,int))); + connect(m_CompleteView, TQT_SIGNAL(zoomRectMoveFinished()), + this, TQT_SLOT(zoomRectMoveFinished())); m_LastAutoPosition = TopLeft; _isMoving = false; _noUpdateZoomerPos = false; @@ -114,13 +114,13 @@ RevGraphView::~RevGraphView() delete renderProcess; } -void RevGraphView::showText(const QString&s) +void RevGraphView::showText(const TQString&s) { clear(); - m_Canvas = new QCanvas(QApplication::desktop()->width(), - QApplication::desktop()->height()); + m_Canvas = new TQCanvas(TQApplication::desktop()->width(), + TQApplication::desktop()->height()); - QCanvasText* t = new QCanvasText(s, m_Canvas); + TQCanvasText* t = new TQCanvasText(s, m_Canvas); t->move(5, 5); t->show(); center(0,0); @@ -164,20 +164,20 @@ void RevGraphView::endInsert() void RevGraphView::readDotOutput(KProcess*,char * buffer,int buflen) { - dotOutput+=QString::fromLocal8Bit(buffer, buflen); + dotOutput+=TQString::fromLocal8Bit(buffer, buflen); } void RevGraphView::dotExit(KProcess*p) { if (p!=renderProcess)return; // remove line breaks when lines to long - QRegExp endslash("\\\\\\n"); - dotOutput.replace(endslash,""); + TQRegExp endslash("\\\\\\n"); + dotOutput.tqreplace(endslash,""); double scale = 1.0, scaleX = 1.0, scaleY = 1.0; double dotWidth, dotHeight; - QTextStream* dotStream; - dotStream = new QTextStream(dotOutput, IO_ReadOnly); - QString line,cmd; + TQTextStream* dotStream; + dotStream = new TQTextStream(dotOutput, IO_ReadOnly); + TQString line,cmd; int lineno=0; clear(); beginInsert(); @@ -187,7 +187,7 @@ void RevGraphView::dotExit(KProcess*p) if (line.isNull()) break; lineno++; if (line.isEmpty()) continue; - QTextStream lineStream(line, IO_ReadOnly); + TQTextStream lineStream(line, IO_ReadOnly); lineStream >> cmd; if (cmd == "stop") {break; } @@ -198,12 +198,12 @@ void RevGraphView::dotExit(KProcess*p) int h = (int)(scaleY * dotHeight); _xMargin = 50; - if (w < QApplication::desktop()->width()) - _xMargin += (QApplication::desktop()->width()-w)/2; + if (w < TQApplication::desktop()->width()) + _xMargin += (TQApplication::desktop()->width()-w)/2; _yMargin = 50; - if (h < QApplication::desktop()->height()) - _yMargin += (QApplication::desktop()->height()-h)/2; - m_Canvas = new QCanvas(int(w+2*_xMargin), int(h+2*_yMargin)); + if (h < TQApplication::desktop()->height()) + _yMargin += (TQApplication::desktop()->height()-h)/2; + m_Canvas = new TQCanvas(int(w+2*_xMargin), int(h+2*_yMargin)); continue; } if ((cmd != "node") && (cmd != "edge")) { @@ -212,8 +212,8 @@ void RevGraphView::dotExit(KProcess*p) continue; } if (cmd=="node") { - QString nodeName, label; - QString _x,_y,_w,_h; + TQString nodeName, label; + TQString _x,_y,_w,_h; double x, y, width, height; lineStream >> nodeName >> _x >> _y >> _w >> _h; x=_x.toDouble(); @@ -227,7 +227,7 @@ void RevGraphView::dotExit(KProcess*p) int yy = (int)(scaleY * (dotHeight - y) + _yMargin); int w = (int)(scaleX * width); int h = (int)(scaleY * height); - QRect r(xx-w/2, yy-h/2, w, h); + TQRect r(xx-w/2, yy-h/2, w, h); GraphTreeLabel*t=new GraphTreeLabel(label,nodeName,r,m_Canvas); if (isStart(nodeName)) { ensureVisible(r.x(),r.y()); @@ -237,10 +237,10 @@ void RevGraphView::dotExit(KProcess*p) t->show(); m_NodeList[nodeName]=t; } else { - QString node1Name, node2Name, label; - QString _x,_y; + TQString node1Name, node2Name, label; + TQString _x,_y; double x, y; - QPointArray pa; + TQPointArray pa; int points, i; lineStream >> node1Name >> node2Name; lineStream >> points; @@ -264,26 +264,26 @@ void RevGraphView::dotExit(KProcess*p) } GraphEdge * n = new GraphEdge(m_Canvas); - QColor arrowColor = Qt::black; - n->setPen(QPen(arrowColor,1)); + TQColor arrowColor = TQt::black; + n->setPen(TQPen(arrowColor,1)); n->setControlPoints(pa,false); n->setZ(0.5); n->show(); /* arrow */ - QPoint arrowDir; + TQPoint arrowDir; int indexHead = -1; - QMap::Iterator it; - it = m_NodeList.find(node2Name); + TQMap::Iterator it; + it = m_NodeList.tqfind(node2Name); if (it!=m_NodeList.end()) { it.data()->setSource(node1Name); } - it = m_NodeList.find(node1Name); + it = m_NodeList.tqfind(node1Name); if (it!=m_NodeList.end()) { GraphTreeLabel*tlab = it.data(); if (tlab) { - QPoint toCenter = tlab->rect().center(); + TQPoint toCenter = tlab->rect().center(); int dx0 = pa.point(0).x() - toCenter.x(); int dy0 = pa.point(0).y() - toCenter.y(); int dx1 = pa.point(points-1).x() - toCenter.x(); @@ -310,11 +310,11 @@ void RevGraphView::dotExit(KProcess*p) if (!arrowDir.isNull()) { arrowDir *= 10.0/sqrt(double(arrowDir.x()*arrowDir.x() + arrowDir.y()*arrowDir.y())); - QPointArray a(3); + TQPointArray a(3); a.setPoint(0, pa.point(indexHead) + arrowDir); - a.setPoint(1, pa.point(indexHead) + QPoint(arrowDir.y()/2, + a.setPoint(1, pa.point(indexHead) + TQPoint(arrowDir.y()/2, -arrowDir.x()/2)); - a.setPoint(2, pa.point(indexHead) + QPoint(-arrowDir.y()/2, + a.setPoint(2, pa.point(indexHead) + TQPoint(-arrowDir.y()/2, arrowDir.x()/2)); GraphEdgeArrow* aItem = new GraphEdgeArrow(n,m_Canvas); aItem->setPoints(a); @@ -326,7 +326,7 @@ void RevGraphView::dotExit(KProcess*p) } } if (!m_Canvas) { - QString s = i18n("Error running the graph layouting tool.\n"); + TQString s = i18n("Error running the graph tqlayouting tool.\n"); s += i18n("Please check that 'dot' is installed (package GraphViz)."); showText(s); } else { @@ -338,11 +338,11 @@ void RevGraphView::dotExit(KProcess*p) renderProcess=0; } -bool RevGraphView::isStart(const QString&nodeName)const +bool RevGraphView::isStart(const TQString&nodeName)const { bool res = false; trevTree::ConstIterator it; - it = m_Tree.find(nodeName); + it = m_Tree.tqfind(nodeName); if (it==m_Tree.end()) { return res; } @@ -354,21 +354,21 @@ bool RevGraphView::isStart(const QString&nodeName)const return res; } -char RevGraphView::getAction(const QString&nodeName)const +char RevGraphView::getAction(const TQString&nodeName)const { trevTree::ConstIterator it; - it = m_Tree.find(nodeName); + it = m_Tree.tqfind(nodeName); if (it==m_Tree.end()) { return (char)0; } return it.data().Action; } -QColor RevGraphView::getBgColor(const QString&nodeName)const +TQColor RevGraphView::getBgColor(const TQString&nodeName)const { trevTree::ConstIterator it; - it = m_Tree.find(nodeName); - QColor res = Qt::white; + it = m_Tree.tqfind(nodeName); + TQColor res = TQt::white; if (it==m_Tree.end()) { return res; } @@ -397,43 +397,43 @@ QColor RevGraphView::getBgColor(const QString&nodeName)const return res; } -const QString&RevGraphView::getLabelstring(const QString&nodeName) +const TQString&RevGraphView::getLabelstring(const TQString&nodeName) { - QMap::ConstIterator nIt; - nIt = m_LabelMap.find(nodeName); + TQMap::ConstIterator nIt; + nIt = m_LabelMap.tqfind(nodeName); if (nIt!=m_LabelMap.end()) { return nIt.data(); } trevTree::ConstIterator it1; - it1 = m_Tree.find(nodeName); + it1 = m_Tree.tqfind(nodeName); if (it1==m_Tree.end()) { return m_LabelMap[""]; } - QString res; + TQString res; switch (it1.data().Action) { case 'D': - res = i18n("Deleted at revision %1").arg(it1.data().rev); + res = i18n("Deleted at revision %1").tqarg(it1.data().rev); break; case 'A': res = i18n("Added at revision %1 as %2") - .arg(it1.data().rev) - .arg(it1.data().name); + .tqarg(it1.data().rev) + .tqarg(it1.data().name); break; case 'C': case 1: - res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 2: - res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 'M': - res = i18n("Modified at revision %1").arg(it1.data().rev); + res = i18n("Modified at revision %1").tqarg(it1.data().rev); break; case 'R': - res = i18n("Replaced at revision %1").arg(it1.data().rev); + res = i18n("Replaced at revision %1").tqarg(it1.data().rev); break; default: - res=i18n("Revision %1").arg(it1.data().rev); + res=i18n("Revision %1").tqarg(it1.data().rev); break; } m_LabelMap[nodeName]=res; @@ -445,19 +445,19 @@ void RevGraphView::dumpRevtree() delete dotTmpFile; clear(); dotOutput = ""; - dotTmpFile = new KTempFile(QString::null,".dot"); + dotTmpFile = new KTempFile(TQString(),".dot"); dotTmpFile->setAutoDelete(true); - QTextStream* stream = dotTmpFile->textStream(); + TQTextStream* stream = dotTmpFile->textStream(); if (!stream) { - showText(i18n("Could not open tempfile %1 for writing.").arg(dotTmpFile->name())); + showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name())); return; } *stream << "digraph \"callgraph\" {\n"; *stream << " bgcolor=\"transparent\";\n"; int dir = Kdesvnsettings::tree_direction(); - *stream << QString(" rankdir=\""); + *stream << TQString(" rankdir=\""); switch (dir) { case 3: *stream << "TB"; @@ -475,13 +475,13 @@ void RevGraphView::dumpRevtree() } *stream << "\";\n"; - //*stream << QString(" overlap=false;\n splines=true;\n"); + //*stream << TQString(" overlap=false;\n splines=true;\n"); RevGraphView::trevTree::ConstIterator it1; for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) { *stream << " " << it1.key() << "[ " - << "shape=box, " + << "tqshape=box, " << "label=\""<setEnvironment("LANG","C"); *renderProcess << "dot"; *renderProcess << dotTmpFile->name() << "-Tplain"; - connect(renderProcess,SIGNAL(processExited(KProcess*)),this,SLOT(dotExit(KProcess*))); - connect(renderProcess,SIGNAL(receivedStdout(KProcess*,char*,int)), - this,SLOT(readDotOutput(KProcess*,char*,int)) ); + connect(renderProcess,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(dotExit(KProcess*))); + connect(renderProcess,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this,TQT_SLOT(readDotOutput(KProcess*,char*,int)) ); if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) { - QString arguments; + TQString arguments; for (unsigned c=0;cargs().count();++c) { - arguments+=QString(" %1").arg(renderProcess->args()[c]); + arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data()); } - QString error = i18n("Could not start process \"%1\".").arg(arguments); + TQString error = i18n("Could not start process \"%1\".").tqarg(arguments); showText(error); renderProcess=0; //delete renderProcess;< } } -QString RevGraphView::toolTip(const QString&_nodename,bool full)const +TQString RevGraphView::toolTip(const TQString&_nodename,bool full)const { - QString res = QString::null; + TQString res = TQString(); trevTree::ConstIterator it; - it = m_Tree.find(_nodename); + it = m_Tree.tqfind(_nodename); if (it==m_Tree.end()) { return res; } - QStringList sp = QStringList::split("\n",it.data().Message); - QString sm; + TQStringList sp = TQStringList::split("\n",it.data().Message); + TQString sm; if (sp.count()==0) { sm = it.data().Message; } else { @@ -536,34 +536,34 @@ QString RevGraphView::toolTip(const QString&_nodename,bool full)const sm.truncate(47); sm+="..."; } - static QString csep = ""; - static QString rend = ""; - static QString rstart = ""; - res = QString(""); + static TQString csep = ""; + static TQString rend = ""; + static TQString rstart = ""; + res = TQString(""); if (!full) { - res+=QString("%1").arg(it.data().name); + res+=TQString("%1").tqarg(it.data().name); res += i18n("
Revision: %1
Author: %2
Date: %3
Log: %4") - .arg(it.data().rev) - .arg(it.data().Author) - .arg(it.data().Date) - .arg(sm); + .tqarg(it.data().rev) + .tqarg(it.data().Author) + .tqarg(it.data().Date) + .tqarg(sm); } else { res+=""; res+=rstart; - res+=i18n("Revision%1%2%3").arg(csep).arg(it.data().rev).arg(rend); - res+=rstart+i18n("Author%1%2%3").arg(csep).arg(it.data().Author).arg(rend); - res+=rstart+i18n("Date%1%2%3").arg(csep).arg(it.data().Date).arg(rend); - res+=rstart+i18n("Log%1%2%3").arg(csep).arg(sm).arg(rend); + res+=i18n("Revision%1%2%3").tqarg(csep).tqarg(it.data().rev).tqarg(rend); + res+=rstart+i18n("Author%1%2%3").tqarg(csep).tqarg(it.data().Author).tqarg(rend); + res+=rstart+i18n("Date%1%2%3").tqarg(csep).tqarg(it.data().Date).tqarg(rend); + res+=rstart+i18n("Log%1%2%3").tqarg(csep).tqarg(sm).tqarg(rend); res+="
"+it.data().name+"
"; } return res; } -void RevGraphView::updateSizes(QSize s) +void RevGraphView::updateSizes(TQSize s) { if (!m_Canvas) return; - if (s == QSize(0,0)) s = size(); + if (s == TQSize(0,0)) s = size(); // the part of the canvas that should be visible int cWidth = m_Canvas->width() - 2*_xMargin + 100; @@ -597,7 +597,7 @@ void RevGraphView::updateSizes(QSize s) m_Canvas->width(), m_Canvas->height(), cWidth, cHeight, zoom); - QWMatrix wm; + TQWMatrix wm; wm.scale( zoom, zoom ); m_CompleteView->setWorldMatrix(wm); @@ -621,8 +621,8 @@ void RevGraphView::updateZoomerPos() int x = width()- cvW - verticalScrollBar()->width() -2; int y = height()-cvH - horizontalScrollBar()->height() -2; - QPoint oldZoomPos = m_CompleteView->pos(); - QPoint newZoomPos = QPoint(0,0); + TQPoint oldZoomPos = m_CompleteView->pos(); + TQPoint newZoomPos = TQPoint(0,0); #if 0 ZoomPosition zp = _zoomPosition; @@ -630,18 +630,18 @@ void RevGraphView::updateZoomerPos() #else ZoomPosition zp = m_LastAutoPosition; #endif - QPoint tl1Pos = viewportToContents(QPoint(0,0)); - QPoint tl2Pos = viewportToContents(QPoint(cvW,cvH)); - QPoint tr1Pos = viewportToContents(QPoint(x,0)); - QPoint tr2Pos = viewportToContents(QPoint(x+cvW,cvH)); - QPoint bl1Pos = viewportToContents(QPoint(0,y)); - QPoint bl2Pos = viewportToContents(QPoint(cvW,y+cvH)); - QPoint br1Pos = viewportToContents(QPoint(x,y)); - QPoint br2Pos = viewportToContents(QPoint(x+cvW,y+cvH)); - int tlCols = m_Canvas->collisions(QRect(tl1Pos,tl2Pos)).count(); - int trCols = m_Canvas->collisions(QRect(tr1Pos,tr2Pos)).count(); - int blCols = m_Canvas->collisions(QRect(bl1Pos,bl2Pos)).count(); - int brCols = m_Canvas->collisions(QRect(br1Pos,br2Pos)).count(); + TQPoint tl1Pos = viewportToContents(TQPoint(0,0)); + TQPoint tl2Pos = viewportToContents(TQPoint(cvW,cvH)); + TQPoint tr1Pos = viewportToContents(TQPoint(x,0)); + TQPoint tr2Pos = viewportToContents(TQPoint(x+cvW,cvH)); + TQPoint bl1Pos = viewportToContents(TQPoint(0,y)); + TQPoint bl2Pos = viewportToContents(TQPoint(cvW,y+cvH)); + TQPoint br1Pos = viewportToContents(TQPoint(x,y)); + TQPoint br2Pos = viewportToContents(TQPoint(x+cvW,y+cvH)); + int tlCols = m_Canvas->collisions(TQRect(tl1Pos,tl2Pos)).count(); + int trCols = m_Canvas->collisions(TQRect(tr1Pos,tr2Pos)).count(); + int blCols = m_Canvas->collisions(TQRect(bl1Pos,bl2Pos)).count(); + int brCols = m_Canvas->collisions(TQRect(br1Pos,br2Pos)).count(); int minCols = tlCols; zp = m_LastAutoPosition; switch(zp) { @@ -662,13 +662,13 @@ void RevGraphView::updateZoomerPos() #endif switch(zp) { case TopRight: - newZoomPos = QPoint(x,0); + newZoomPos = TQPoint(x,0); break; case BottomLeft: - newZoomPos = QPoint(0,y); + newZoomPos = TQPoint(0,y); break; case BottomRight: - newZoomPos = QPoint(x,y); + newZoomPos = TQPoint(x,y); break; default: break; @@ -678,7 +678,7 @@ void RevGraphView::updateZoomerPos() void RevGraphView::contentsMovingSlot(int x,int y) { - QRect z(int(x * _cvZoom), int(y * _cvZoom), + TQRect z(int(x * _cvZoom), int(y * _cvZoom), int(visibleWidth() * _cvZoom)-1, int(visibleHeight() * _cvZoom)-1); if (0) qDebug("moving: (%d,%d) => (%d/%d - %dx%d)", x, y, z.x(), z.y(), z.width(), z.height()); @@ -705,9 +705,9 @@ void RevGraphView::zoomRectMoveFinished() updateZoomerPos(); } -void RevGraphView::resizeEvent(QResizeEvent*e) +void RevGraphView::resizeEvent(TQResizeEvent*e) { - QCanvasView::resizeEvent(e); + TQCanvasView::resizeEvent(e); if (m_Canvas) updateSizes(e->size()); } @@ -732,13 +732,13 @@ void RevGraphView::makeSelected(GraphTreeLabel*gtl) m_CompleteView->updateCurrentRect(); } -void RevGraphView::contentsMouseDoubleClickEvent ( QMouseEvent * e ) +void RevGraphView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { setFocus(); if (e->button() == Qt::LeftButton) { - QCanvasItemList l = canvas()->collisions(e->pos()); + TQCanvasItemList l = canvas()->collisions(e->pos()); if (l.count()>0) { - QCanvasItem* i = l.first(); + TQCanvasItem* i = l.first(); if (i->rtti()==GRAPHTREE_LABEL) { makeSelected( (GraphTreeLabel*)i); emit dispDetails(toolTip(((GraphTreeLabel*)i)->nodename(),true)); @@ -747,20 +747,20 @@ void RevGraphView::contentsMouseDoubleClickEvent ( QMouseEvent * e ) } } -void RevGraphView::contentsMousePressEvent ( QMouseEvent * e ) +void RevGraphView::contentsMousePressEvent ( TQMouseEvent * e ) { setFocus(); _isMoving = true; _lastPos = e->globalPos(); } -void RevGraphView::contentsMouseReleaseEvent ( QMouseEvent * ) +void RevGraphView::contentsMouseReleaseEvent ( TQMouseEvent * ) { _isMoving = false; updateZoomerPos(); } -void RevGraphView::contentsMouseMoveEvent ( QMouseEvent * e ) +void RevGraphView::contentsMouseMoveEvent ( TQMouseEvent * e ) { if (_isMoving) { int dx = e->globalPos().x() - _lastPos.x(); @@ -780,13 +780,13 @@ void RevGraphView::setNewDirection(int dir) dumpRevtree(); } -void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) +void RevGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) { if (!m_Canvas) return; - QCanvasItemList l = canvas()->collisions(e->pos()); - QCanvasItem* i = (l.count() == 0) ? 0 : l.first(); + TQCanvasItemList l = canvas()->collisions(e->pos()); + TQCanvasItem* i = (l.count() == 0) ? 0 : l.first(); - QPopupMenu popup; + TQPopupMenu popup; if (i && i->rtti()==GRAPHTREE_LABEL) { if (!((GraphTreeLabel*)i)->source().isEmpty() && getAction(((GraphTreeLabel*)i)->nodename())!='D') { popup.insertItem(i18n("Diff to previous"),301); @@ -832,7 +832,7 @@ void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) break; case 201: { - QString fn = KFileDialog::getSaveFileName(":","*.png"); + TQString fn = KFileDialog::getSaveFileName(":","*.png"); if (!fn.isEmpty()) { if (m_Marker) { m_Marker->hide(); @@ -840,8 +840,8 @@ void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) if (m_Selected) { m_Selected->setSelected(false); } - QPixmap pix(m_Canvas->size()); - QPainter p(&pix); + TQPixmap pix(m_Canvas->size()); + TQPainter p(&pix); m_Canvas->drawArea( m_Canvas->rect(), &p ); pix.save(fn,"PNG"); if (m_Marker) { @@ -894,57 +894,57 @@ void RevGraphView::makeCat(GraphTreeLabel*_l) if (!_l) { return; } - QString n1 = _l->nodename(); - trevTree::ConstIterator it = m_Tree.find(n1); + TQString n1 = _l->nodename(); + trevTree::ConstIterator it = m_Tree.tqfind(n1); if (it==m_Tree.end()) { return; } svn::Revision tr(it.data().rev); - QString tp = _basePath+it.data().name; - emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget()); + TQString tp = _basePath+it.data().name; + emit makeCat(tr,tp,it.data().name,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } void RevGraphView::makeDiffPrev(GraphTreeLabel*_l) { if (!_l) return; - QString n1,n2; + TQString n1,n2; n1 = _l->nodename(); n2 = _l->source(); makeDiff(n1,n2); } -void RevGraphView::makeDiff(const QString&n1,const QString&n2) +void RevGraphView::makeDiff(const TQString&n1,const TQString&n2) { if (n1.isEmpty()||n2.isEmpty()) return; trevTree::ConstIterator it; - it = m_Tree.find(n2); + it = m_Tree.tqfind(n2); if (it==m_Tree.end()) { return; } svn::Revision sr(it.data().rev); - QString sp = _basePath+it.data().name; + TQString sp = _basePath+it.data().name; - it = m_Tree.find(n1); + it = m_Tree.tqfind(n1); if (it==m_Tree.end()) { return; } svn::Revision tr(it.data().rev); - QString tp = _basePath+it.data().name; + TQString tp = _basePath+it.data().name; if (Kdesvnsettings::tree_diff_rec()) { - emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); + emit makeRecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } else { - emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); + emit makeNorecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } } -void RevGraphView::setBasePath(const QString&_path) +void RevGraphView::setBasePath(const TQString&_path) { _basePath = _path; } -void RevGraphView::slotClientException(const QString&what) +void RevGraphView::slotClientException(const TQString&what) { - KMessageBox::sorry(KApplication::activeModalWidget(),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); } #include "revgraphview.moc" diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index 039bc4b..dcfc007 100644 --- a/src/svnfrontend/graphtree/revgraphview.h +++ b/src/svnfrontend/graphtree/revgraphview.h @@ -22,7 +22,7 @@ #include -#include +#include namespace svn { class LogEntry; @@ -41,18 +41,19 @@ class CContextListener; /** @author Rajko Albrecht */ -class RevGraphView : public QCanvasView +class RevGraphView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; /* avoid large copy operations */ friend class RevisionTree; - RevGraphView(QObject*,svn::Client*,QWidget * parent = 0, const char * name = 0, WFlags f = 0); + RevGraphView(TQObject*,svn::Client*,TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); virtual ~RevGraphView(); - void showText(const QString&s); + void showText(const TQString&s); void clear(); void beginInsert(); @@ -60,63 +61,63 @@ public: struct targetData { char Action; - QString key; - targetData(const QString&n,char _a) + TQString key; + targetData(const TQString&n,char _a) { key = n; Action = _a; } targetData(){Action=0;key="";} }; - typedef QValueList tlist; + typedef TQValueList tlist; struct keyData { - QString name,Author,Date,Message; + TQString name,Author,Date,Message; long rev; char Action; tlist targets; }; - typedef QMap trevTree; + typedef TQMap trevTree; - QString toolTip(const QString&nodename,bool full=false)const; + TQString toolTip(const TQString&nodename,bool full=false)const; - void setBasePath(const QString&); + void setBasePath(const TQString&); void dumpRevtree(); signals: - void dispDetails(const QString&); - void makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*); - void makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - void makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); + void dispDetails(const TQString&); + void makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*); + void makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + void makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); public slots: virtual void contentsMovingSlot(int,int); virtual void zoomRectMoved(int,int); virtual void zoomRectMoveFinished(); - virtual void slotClientException(const QString&what); + virtual void slotClientException(const TQString&what); protected slots: virtual void readDotOutput(KProcess * proc,char * buffer,int buflen); virtual void dotExit(KProcess*); protected: - QCanvas*m_Canvas; + TQCanvas*m_Canvas; GraphMark*m_Marker; svn::Client*m_Client; GraphTreeLabel*m_Selected; - QObject*m_Listener; + TQObject*m_Listener; KTempFile*dotTmpFile; - QString dotOutput; + TQString dotOutput; KProcess*renderProcess; trevTree m_Tree; - QColor getBgColor(const QString&nodeName)const; - bool isStart(const QString&nodeName)const; - char getAction(const QString&)const; - const QString&getLabelstring(const QString&nodeName); + TQColor getBgColor(const TQString&nodeName)const; + bool isStart(const TQString&nodeName)const; + char getAction(const TQString&)const; + const TQString&getLabelstring(const TQString&nodeName); - QMap m_NodeList; - QMap m_LabelMap; + TQMap m_NodeList; + TQMap m_LabelMap; int _xMargin,_yMargin; GraphViewTip*m_Tip; @@ -124,26 +125,26 @@ protected: double _cvZoom; ZoomPosition m_LastAutoPosition; - virtual void resizeEvent(QResizeEvent*); - virtual void contentsMousePressEvent ( QMouseEvent * e ); - virtual void contentsMouseReleaseEvent ( QMouseEvent * e ); - virtual void contentsMouseMoveEvent ( QMouseEvent*e); - virtual void contentsContextMenuEvent(QContextMenuEvent*e); - virtual void contentsMouseDoubleClickEvent ( QMouseEvent * e ); + virtual void resizeEvent(TQResizeEvent*); + virtual void contentsMousePressEvent ( TQMouseEvent * e ); + virtual void contentsMouseReleaseEvent ( TQMouseEvent * e ); + virtual void contentsMouseMoveEvent ( TQMouseEvent*e); + virtual void contentsContextMenuEvent(TQContextMenuEvent*e); + virtual void contentsMouseDoubleClickEvent ( TQMouseEvent * e ); bool _isMoving; - QPoint _lastPos; + TQPoint _lastPos; bool _noUpdateZoomerPos; - QString _basePath; + TQString _basePath; private: - void updateSizes(QSize s = QSize(0,0)); + void updateSizes(TQSize s = TQSize(0,0)); void updateZoomerPos(); void setNewDirection(int dir); void makeDiffPrev(GraphTreeLabel*); - void makeDiff(const QString&,const QString&); + void makeDiff(const TQString&,const TQString&); void makeSelected(GraphTreeLabel*); void makeCat(GraphTreeLabel*_l); }; diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index bb64cf7..a334a0c 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -38,12 +38,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define INTERNALCOPY 1 #define INTERNALRENAME 2 @@ -54,21 +54,21 @@ public: RtreeData(); virtual ~RtreeData(); - QMap m_History; + TQMap m_History; svn::LogEntriesMap m_OldHistory; long max_rev,min_rev; KProgressDialog*progress; - QTime m_stopTick; + TQTime m_stopTick; - QWidget*dlgParent; + TQWidget*dlgParent; RevTreeWidget*m_TreeDisplay; svn::Client*m_Client; - QObject* m_Listener; + TQObject* m_Listener; - bool getLogs(const QString&,const svn::Revision&startr,const svn::Revision&endr,const QString&origin); + bool getLogs(const TQString&,const svn::Revision&startr,const svn::Revision&endr,const TQString&origin); }; RtreeData::RtreeData() @@ -86,13 +86,13 @@ RtreeData::~RtreeData() delete progress; } -bool RtreeData::getLogs(const QString&reposRoot,const svn::Revision&startr,const svn::Revision&endr,const QString&origin) +bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,const svn::Revision&endr,const TQString&origin) { if (!m_Listener||!m_Client) { return false; } try { - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); StopDlg sdlg(m_Listener,dlgParent, 0,"Logs",i18n("Getting logs - hit cancel for abort")); if (svn::Url::isLocal(reposRoot) ) { @@ -104,31 +104,31 @@ bool RtreeData::getLogs(const QString&reposRoot,const svn::Revision&startr,const } else if (Kdesvnsettings::network_on()) { m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0); } else { - KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed."))); + KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(i18n("No logcache possible due broken database and networking not allowed."))); return false; } } } catch (const svn::Exception&ce) { kdDebug()<m_Client=aClient; m_Data->m_Listener=aListener; - m_Data->dlgParent=parent; + m_Data->dlgParent=tqparent; if (!m_Data->getLogs(reposRoot,startr,endr,origin)) { return; @@ -138,7 +138,7 @@ RevisionTree::RevisionTree(svn::Client*aClient, kdDebug()<<"Origin: "<progress=new KProgressDialog( - parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").arg(origin),true); + tqparent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true); m_Data->progress->setMinimumDuration(100); m_Data->progress->show(); m_Data->progress->setAllowCancel(true); @@ -206,7 +206,7 @@ RevisionTree::~RevisionTree() delete m_Data; } -bool RevisionTree::isDeleted(long revision,const QString&path) +bool RevisionTree::isDeleted(long revision,const TQString&path) { for (unsigned i = 0;im_History[revision].changedPaths.count();++i) { if (isParent(m_Data->m_History[revision].changedPaths[i].path,path) && @@ -221,8 +221,8 @@ bool RevisionTree::topDownScan() { m_Data->progress->progressBar()->setTotalSteps(m_Data->max_rev-m_Data->min_rev); bool cancel=false; - QString label; - QString olabel = m_Data->progress->labelText(); + TQString label; + TQString olabel = m_Data->progress->labelText(); for (long j=m_Data->max_rev;j>=m_Data->min_rev;--j) { m_Data->progress->progressBar()->setProgress(m_Data->max_rev-j); kapp->processEvents(); @@ -237,7 +237,7 @@ bool RevisionTree::topDownScan() break; } label = i18n("%1
Check change entry %2 of %3") - .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + .tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } @@ -247,8 +247,8 @@ bool RevisionTree::topDownScan() { if (!m_Data->m_OldHistory[j].changedPaths[i].copyFromPath.isEmpty()) { if (m_InitialRevsionm_OldHistory[j].revision) { - QString tmpPath = m_Path; - QString r = m_Path.mid(m_Data->m_OldHistory[j].changedPaths[i].path.length()); + TQString tmpPath = m_Path; + TQString r = m_Path.mid(m_Data->m_OldHistory[j].changedPaths[i].path.length()); m_Path=m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; m_Path+=r; } @@ -278,13 +278,13 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } if (!m_Data->m_OldHistory[j].changedPaths[i].copyFromPath.isEmpty()) { long r = m_Data->m_OldHistory[j].changedPaths[i].copyFromRevision; - QString sourcepath = m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; + TQString sourcepath = m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; char a = m_Data->m_OldHistory[j].changedPaths[i].action; if (m_Data->m_OldHistory[j].changedPaths[i].path.isEmpty()) { kdDebug()<<"Empty entry! rev " << j << " source " << sourcepath << endl; @@ -331,11 +331,11 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } - m_Data->m_History[j].addCopyTo(m_Data->m_OldHistory[j].changedPaths[i].path,QString::null,-1,m_Data->m_OldHistory[j].changedPaths[i].action); + m_Data->m_History[j].addCopyTo(m_Data->m_OldHistory[j].changedPaths[i].path,TQString(),-1,m_Data->m_OldHistory[j].changedPaths[i].action); } m_Data->m_History[j].author=m_Data->m_OldHistory[j].author; m_Data->m_History[j].date=m_Data->m_OldHistory[j].date; @@ -346,10 +346,10 @@ bool RevisionTree::topDownScan() return !cancel; } -bool RevisionTree::isParent(const QString&_par,const QString&tar) +bool RevisionTree::isParent(const TQString&_par,const TQString&tar) { if (_par==tar) return true; - QString par = _par+(_par.endsWith("/")?"":"/"); + TQString par = _par+(_par.endsWith("/")?"":"/"); return tar.startsWith(par); } @@ -358,22 +358,22 @@ bool RevisionTree::isValid()const return m_Valid; } -static QString uniqueNodeName(long rev,const QString&path) +static TQString uniqueNodeName(long rev,const TQString&path) { - QString res = KCodecs::base64Encode(path.local8Bit(),false); - res.replace("\"","_quot_"); - res.replace(" ","_space_"); - QString n; n.sprintf("%05ld",rev); - res = "\""+n+QString("_%1\"").arg(res); + TQString res = KCodecs::base64Encode(path.local8Bit(),false); + res.tqreplace("\"","_quot_"); + res.tqreplace(" ","_space_"); + TQString n; n.sprintf("%05ld",rev); + res = "\""+n+TQString("_%1\"").tqarg(res); return res; } -bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_path,long _last) +bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const TQString&_path,long _last) { #define REVENTRY m_Data->m_History[j] #define FORWARDENTRY m_Data->m_History[j].changedPaths[i] - QString path = _path; + TQString path = _path; long lastrev = _last; /* this is required if an item will modified AND copied at same revision.*/ long trev = -1; @@ -396,7 +396,7 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa if (!isParent(FORWARDENTRY.path,path)) { continue; } - QString n1,n2; + TQString n1,n2; if (isParent(FORWARDENTRY.path,path)) { bool get_out = false; if (FORWARDENTRY.path!=path) { @@ -407,12 +407,12 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa if (FORWARDENTRY.action==INTERNALCOPY || FORWARDENTRY.action==INTERNALRENAME ) { bool ren = FORWARDENTRY.action==INTERNALRENAME; - QString tmpPath = path; - QString recPath; + TQString tmpPath = path; + TQString recPath; if (FORWARDENTRY.copyToPath.length()==0) { continue; } - QString r = path.mid(FORWARDENTRY.path.length()); + TQString r = path.mid(FORWARDENTRY.path.length()); recPath= FORWARDENTRY.copyToPath; recPath+=r; n1 = uniqueNodeName(lastrev,tmpPath); @@ -521,12 +521,12 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa return !cancel; } -QWidget*RevisionTree::getView() +TQWidget*RevisionTree::getView() { return m_Data->m_TreeDisplay; } -void RevisionTree::fillItem(long rev,int pathIndex,const QString&nodeName,const QString&path) +void RevisionTree::fillItem(long rev,int pathIndex,const TQString&nodeName,const TQString&path) { m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[nodeName].name=path; m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[nodeName].rev = rev; diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index 508306f..175754d 100644 --- a/src/svnfrontend/graphtree/revisiontree.h +++ b/src/svnfrontend/graphtree/revisiontree.h @@ -24,12 +24,12 @@ #include "src/svnqt/revision.hpp" #include "src/svnqt/client.hpp" -#include -#include -#include +#include +#include +#include class RtreeData; -class QWidget; +class TQWidget; class KListViewItem; class KListView; class CContextListener; @@ -45,31 +45,31 @@ namespace svn class RevisionTree{ public: RevisionTree(svn::Client*, - QObject*aListener, - const QString& reposRoot, + TQObject*aListener, + const TQString& reposRoot, const svn::Revision&startr,const svn::Revision&endr, - const QString&,const svn::Revision& baserevision,QWidget*treeParent, - QWidget*parent=0); + const TQString&,const svn::Revision& baserevision,TQWidget*treeParent, + TQWidget*tqparent=0); virtual ~RevisionTree(); bool isValid()const; - QWidget*getView(); + TQWidget*getView(); protected: long m_Baserevision; long m_InitialRevsion; - QString m_Path; + TQString m_Path; bool m_Valid; RtreeData*m_Data; bool topDownScan(); - bool bottomUpScan(long startrev,unsigned recurse,const QString&path,long sRev = -1); - bool isDeleted(long revision,const QString&); + bool bottomUpScan(long startrev,unsigned recurse,const TQString&path,long sRev = -1); + bool isDeleted(long revision,const TQString&); - static bool isParent(const QString&_par,const QString&tar); + static bool isParent(const TQString&_par,const TQString&tar); - void fillItem(long revIndex,int pathIndex,const QString&nodeName,const QString&path); + void fillItem(long revIndex,int pathIndex,const TQString&nodeName,const TQString&path); }; #endif diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index 35b5258..eaf6fcc 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -20,55 +20,55 @@ #include "revtreewidget.h" #include "src/settings/kdesvnsettings.h" -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include "revgraphview.h" #include "ktextbrowser.h" /* - * Constructs a RevTreeWidget as a child of 'parent', with the + * Constructs a RevTreeWidget as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -RevTreeWidget::RevTreeWidget(QObject*lt,svn::Client*cl, QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "RevTreeWidget" ); - RevTreeWidgetLayout = new QVBoxLayout( this, 11, 6, "RevTreeWidgetLayout"); + RevTreeWidgetLayout = new TQVBoxLayout( this, 11, 6, "RevTreeWidgetLayout"); - m_Splitter = new QSplitter( this, "m_Splitter" ); - m_Splitter->setOrientation( QSplitter::Vertical ); + m_Splitter = new TQSplitter( this, "m_Splitter" ); + m_Splitter->setOrientation( Qt::Vertical ); m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" ); - m_RevGraphView->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); - connect(m_RevGraphView,SIGNAL(dispDetails(const QString&)),this,SLOT(setDetailText(const QString&))); + m_RevGraphView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); + connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&))); connect(m_RevGraphView, - SIGNAL(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - SIGNAL(makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - SIGNAL(makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)) ); m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" ); - m_Detailstext->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); + m_Detailstext->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); m_Detailstext->setResizePolicy( KTextBrowser::Manual ); RevTreeWidgetLayout->addWidget( m_Splitter ); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); - QValueList list = Kdesvnsettings::tree_detail_height(); + TQValueList list = Kdesvnsettings::tree_detail_height(); if (list.count()==2 && (list[0]>0||list[1]>0)) { m_Splitter->setSizes(list); } @@ -79,15 +79,15 @@ RevTreeWidget::RevTreeWidget(QObject*lt,svn::Client*cl, QWidget* parent, const c */ RevTreeWidget::~RevTreeWidget() { - // no need to delete child widgets, Qt does it all for us - QValueList list = m_Splitter->sizes(); + // no need to delete child widgets, TQt does it all for us + TQValueList list = m_Splitter->sizes(); if (list.count()==2) { Kdesvnsettings::setTree_detail_height(list); Kdesvnsettings::writeConfig(); } } -void RevTreeWidget::setBasePath(const QString&_p) +void RevTreeWidget::setBasePath(const TQString&_p) { m_RevGraphView->setBasePath(_p); } @@ -97,10 +97,10 @@ void RevTreeWidget::dumpRevtree() m_RevGraphView->dumpRevtree(); } -void RevTreeWidget::setDetailText(const QString&_s) +void RevTreeWidget::setDetailText(const TQString&_s) { m_Detailstext->setText(_s); - QValueList list = m_Splitter->sizes(); + TQValueList list = m_Splitter->sizes(); if (list.count()!=2) return; if (list[1]==0) { int h = height(); diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h index 324f0ba..61e4753 100644 --- a/src/svnfrontend/graphtree/revtreewidget.h +++ b/src/svnfrontend/graphtree/revtreewidget.h @@ -22,16 +22,16 @@ #include -#include -#include -#include +#include +#include +#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; class RevGraphView; -class QSplitter; +class TQSplitter; class KTextBrowser; class CContextListener; @@ -40,34 +40,35 @@ namespace svn { class Client; } -class RevTreeWidget : public QWidget +class RevTreeWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RevTreeWidget(QObject*,svn::Client*,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + RevTreeWidget(TQObject*,svn::Client*,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~RevTreeWidget(); - QSplitter* m_Splitter; + TQSplitter* m_Splitter; RevGraphView* m_RevGraphView; - void setBasePath(const QString&); + void setBasePath(const TQString&); void dumpRevtree(); protected: - QVBoxLayout* RevTreeWidgetLayout; + TQVBoxLayout* RevTreeWidgetLayout; KTextBrowser* m_Detailstext; signals: - void makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*); - void makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - void makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); + void makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*); + void makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + void makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); protected slots: - virtual void setDetailText(const QString&); + virtual void setDetailText(const TQString&); private: - QPixmap image0; + TQPixmap image0; }; -- cgit v1.2.1