{"thread":{"id":"43473","subject":"[PATCH qgit] Remove obsoleted includes","startedAt":"2006-10-26T18:47:08Z","lastAt":"2006-10-27T01:51:21Z","messageCount":2,"participants":["Marco Costalba","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"294993","messageId":"e5bfff550610261147t61de387bqc591624aaa3b1282@mail.gmail.com","threadId":"43473","inReplyTo":null,"subject":"[PATCH qgit] Remove obsoleted includes","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2006-10-26T18:47:08Z","receivedAt":"2006-10-26T18:47:08Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Also small code cleanup\n\nSigned-off-by: Marco Costalba <mcostalba@gmail.com>\n---\n\nStill unable to push to public repo :(\n\n src/listview.cpp |  239 ++++++++++++++++++++++++++----------------------------\n src/listview.h   |    4 +-\n 2 files changed, 115 insertions(+), 128 deletions(-)\n\ndiff --git a/src/listview.cpp b/src/listview.cpp\nindex 1e33ac0..84a2b4c 100644\n--- a/src/listview.cpp\n+++ b/src/listview.cpp\n@@ -6,13 +6,9 @@\n \tCopyright: See COPYING file that comes with this distribution\n\n */\n-#include <qlistview.h>\n #include <qpainter.h>\n-#include <qbitmap.h>\n #include <qapplication.h>\n-#include <qstatusbar.h>\n #include <qheader.h>\n-#include <qpopupmenu.h>\n #include <qdragobject.h>\n #include \"common.h\"\n #include \"domain.h\"\n@@ -406,145 +402,138 @@ void ListViewItem::setDiffTarget(bool b)\n /* Draw graph part for a lane\n  */\n void ListViewItem::paintGraphLane(QPainter* p, int type, int x1, int x2,\n-\t\t\t\t  const QColor& col, const QBrush& back) {\n+                                  const QColor& col, const QBrush& back) {\n\n-        int h = height();\n-\tint r = (x2-x1)/3;\n+\tint h =  height() / 2;\n+\tint m = (x1 + x2) / 2;\n+\tint r = (x2 - x1) / 3;\n+\tint d =  2 * r;\n\n-#define P_CENTER  (x1+x2)/2, h/2\n-#define P_0       x2,        h/2\n-#define P_90      (x1+x2)/2, 0\n-#define P_180     x1,        h/2\n-#define P_270     (x1+x2)/2, h\n-#define R_CENTER  (x1+x2)/2-r, h/2-r, 2*r, 2*r\n+\t#define P_CENTER m , h\n+\t#define P_0      x2, h\n+\t#define P_90     m , 0\n+\t#define P_180    x1, h\n+\t#define P_270    m , 2 * h\n+\t#define R_CENTER m - r, h - r, d, d\n\n-        p->setPen(QPen(col, 2));\n+\tp->setPen(QPen(col, 2));\n\n \t// vertical line\n \tswitch (type) {\n-\t\tcase ACTIVE:\n-\t\tcase NOT_ACTIVE:\n-\t\tcase MERGE_FORK:\n-\t\tcase MERGE_FORK_R:\n-\t\tcase MERGE_FORK_L:\n-\t\tcase JOIN:\n-\t\tcase JOIN_R:\n-\t\tcase JOIN_L:\n-\t\t\tp->drawLine(P_90, P_270);\n-\t\t\tbreak;\n-\t\tcase HEAD:\n-\t\tcase HEAD_R:\n-\t\tcase HEAD_L:\n-\t\tcase BRANCH:\n-\t\t\tp->drawLine(P_CENTER, P_270);\n-\t\t\tbreak;\n-\t\tcase TAIL:\n-\t\tcase TAIL_R:\n-\t\tcase TAIL_L:\n-\t\tcase INITIAL:\n-\t\tcase BOUNDARY:\n-\t\tcase BOUNDARY_C:\n-\t\tcase BOUNDARY_R:\n-\t\tcase BOUNDARY_L:\n-\t\t\tp->drawLine(P_90, P_CENTER);\n-\t\t\tbreak;\n-\t        default:\n-\t\t        break;\n+\tcase ACTIVE:\n+\tcase NOT_ACTIVE:\n+\tcase MERGE_FORK:\n+\tcase MERGE_FORK_R:\n+\tcase MERGE_FORK_L:\n+\tcase JOIN:\n+\tcase JOIN_R:\n+\tcase JOIN_L:\n+\t\tp->drawLine(P_90, P_270);\n+\t\tbreak;\n+\tcase HEAD:\n+\tcase HEAD_R:\n+\tcase HEAD_L:\n+\tcase BRANCH:\n+\t\tp->drawLine(P_CENTER, P_270);\n+\t\tbreak;\n+\tcase TAIL:\n+\tcase TAIL_R:\n+\tcase TAIL_L:\n+\tcase INITIAL:\n+\tcase BOUNDARY:\n+\tcase BOUNDARY_C:\n+\tcase BOUNDARY_R:\n+\tcase BOUNDARY_L:\n+\t\tp->drawLine(P_90, P_CENTER);\n+\t\tbreak;\n+        default:\n+\t\tbreak;\n \t}\n\n \t// horizontal line\n \tswitch (type) {\n-\t\tcase MERGE_FORK:\n-\t\tcase JOIN:\n-\t\tcase HEAD:\n-\t        case TAIL:\n-\t\tcase CROSS:\n-\t\tcase CROSS_EMPTY:\n-\t\tcase BOUNDARY_C:\n-\t\t\tp->drawLine(P_180, P_0);\n-\t\t\tbreak;\n-\t\tcase MERGE_FORK_R:\n-\t\tcase JOIN_R:\n-\t\tcase HEAD_R:\n-\t        case TAIL_R:\n-\t\tcase BOUNDARY_R:\n-\t\t\tp->drawLine(P_180, P_CENTER);\n-\t\t\tbreak;\n-\t\tcase MERGE_FORK_L:\n-\t\tcase JOIN_L:\n-\t\tcase HEAD_L:\n-\t        case TAIL_L:\n-\t\tcase BOUNDARY_L:\n-\t\t\tp->drawLine(P_CENTER, P_0);\n-\t\t\tbreak;\n-\t        default:\n-\t\t        break;\n+\tcase MERGE_FORK:\n+\tcase JOIN:\n+\tcase HEAD:\n+\tcase TAIL:\n+\tcase CROSS:\n+\tcase CROSS_EMPTY:\n+\tcase BOUNDARY_C:\n+\t\tp->drawLine(P_180, P_0);\n+\t\tbreak;\n+\tcase MERGE_FORK_R:\n+\tcase JOIN_R:\n+\tcase HEAD_R:\n+\tcase TAIL_R:\n+\tcase BOUNDARY_R:\n+\t\tp->drawLine(P_180, P_CENTER);\n+\t\tbreak;\n+\tcase MERGE_FORK_L:\n+\tcase JOIN_L:\n+\tcase HEAD_L:\n+\tcase TAIL_L:\n+\tcase BOUNDARY_L:\n+\t\tp->drawLine(P_CENTER, P_0);\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n \t}\n\n \t// center symbol, e.g. rect or ellipse\n \tswitch (type) {\n-\t\tcase ACTIVE:\n-\t\tcase INITIAL:\n-\t\tcase BRANCH:\n-\t\t\tp->setPen(Qt::NoPen);\n-\t\t\tp->setBrush(col);\n-\t\t\tp->drawEllipse(R_CENTER);\n-\t\t\tbreak;\n-\t\tcase MERGE_FORK:\n-\t\tcase MERGE_FORK_R:\n-\t\tcase MERGE_FORK_L:\n-\t\t\tp->setPen(Qt::NoPen);\n-\t\t\tp->setBrush(col);\n-\t\t\tp->drawRect(R_CENTER);\n-\t\t\tbreak;\n-\n-\t\tcase UNAPPLIED:\n-\t\t\t// Red minus sign\n-\t\t\tp->setPen(Qt::NoPen);\n-\t\t\tp->setBrush(red);\n-\t\t\tp->drawRect( (x1+x2)/2-r, h/2 - 1, 2*r, 2);\n-\t\t\tbreak;\n-\n-\t\tcase APPLIED:\n-\t\t\t// Green plus sign\n-\t\t\tp->setPen(Qt::NoPen);\n-\t\t\tp->setBrush(DARK_GREEN);\n-\t\t\tp->drawRect( (x1+x2)/2-r, h/2 - 1, 2*r, 2);\n-\t\t\tp->drawRect( (x1+x2)/2-1, h/2-r, 2, 2*r);\n-\t\t\tbreak;\n-\n-\t\tcase BOUNDARY:\n-\t\t\tp->setBrush(back);\n-\t\t\tp->drawEllipse(R_CENTER);\n-\t\t\tbreak;\n-\n-\t\tcase BOUNDARY_C:\n-\t\tcase BOUNDARY_R:\n-\t\tcase BOUNDARY_L:\n-\t\t\tp->setBrush(back);\n-\t\t\tp->drawRect(R_CENTER);\n-\t\t\tbreak;\n-\n-\t        default:\n-\t\t        break;\n+\tcase ACTIVE:\n+\tcase INITIAL:\n+\tcase BRANCH:\n+\t\tp->setPen(Qt::NoPen);\n+\t\tp->setBrush(col);\n+\t\tp->drawEllipse(R_CENTER);\n+\t\tbreak;\n+\tcase MERGE_FORK:\n+\tcase MERGE_FORK_R:\n+\tcase MERGE_FORK_L:\n+\t\tp->setPen(Qt::NoPen);\n+\t\tp->setBrush(col);\n+\t\tp->drawRect(R_CENTER);\n+\t\tbreak;\n+\tcase UNAPPLIED:\n+\t\t// Red minus sign\n+\t\tp->setPen(Qt::NoPen);\n+\t\tp->setBrush(red);\n+\t\tp->drawRect(m - r, h - 1, d, 2);\n+\t\tbreak;\n+\tcase APPLIED:\n+\t\t// Green plus sign\n+\t\tp->setPen(Qt::NoPen);\n+\t\tp->setBrush(DARK_GREEN);\n+\t\tp->drawRect(m - r, h - 1, d, 2);\n+\t\tp->drawRect(m - 1, h - r, 2, d);\n+\t\tbreak;\n+\tcase BOUNDARY:\n+\t\tp->setBrush(back);\n+\t\tp->drawEllipse(R_CENTER);\n+\t\tbreak;\n+\tcase BOUNDARY_C:\n+\tcase BOUNDARY_R:\n+\tcase BOUNDARY_L:\n+\t\tp->setBrush(back);\n+\t\tp->drawRect(R_CENTER);\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n \t}\n-\n-#undef P_CENTER\n-#undef P_0\n-#undef P_90\n-#undef P_180\n-#undef P_270\n-#undef R_CENTER\n-\n+\t#undef P_CENTER\n+\t#undef P_0\n+\t#undef P_90\n+\t#undef P_180\n+\t#undef P_270\n+\t#undef R_CENTER\n }\n\n-void ListViewItem::paintGraph(const Rev& c, QPainter* p,\n-                              const QColorGroup& cg, int width) {\n-\n-\tstatic QColor colors[COLORS_NUM] = { Qt::black, Qt::red, DARK_GREEN,\n-\t                                     Qt::blue,  Qt::darkGray, BROWN,\n-\t                                     Qt::magenta, ORANGE };\n+void ListViewItem::paintGraph(const Rev& c, QPainter* p, const\nQColorGroup& cg, int width) {\n\n+\tstatic const QColor colors[COLORS_NUM] = { Qt::black, Qt::red, DARK_GREEN,\n+\t                                           Qt::blue,  Qt::darkGray, BROWN,\n+\t                                           Qt::magenta, ORANGE };\n \tQListView* lv = listView();\n \tif (!lv)\n \t\treturn;\ndiff --git a/src/listview.h b/src/listview.h\nindex b1f1011..28d9f60 100644\n--- a/src/listview.h\n+++ b/src/listview.h\n@@ -8,7 +8,6 @@\n\n #include <qobject.h>\n #include <qlistview.h>\n-#include <qptrvector.h>\n #include \"common.h\"\n\n class QFont;\n@@ -20,7 +19,7 @@ class FileHistory;\n class ListViewItem: public QListViewItem {\n public:\n \tListViewItem(QListView* p, ListViewItem* a, Git* g, SCRef sha,\n-\t\t     const int& w, bool e, unsigned long t, FileHistory* f);\n+\t             const int& w, bool e, unsigned long t, FileHistory* f);\n\n \tSCRef sha() const { return sha_; }\n \tint getLaneType(uint pos) const;\n@@ -102,4 +101,3 @@ private:\n };\n\n #endif\n-\n-- \n"},{"id":"297937","messageId":"20061027015121.GW20017@pasky.or.cz","threadId":"43473","inReplyTo":"e5bfff550610261147t61de387bqc591624aaa3b1282@mail.gmail.com","subject":"Re: [PATCH qgit] Remove obsoleted includes","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-10-27T01:51:21Z","receivedAt":"2006-10-27T01:51:21Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Oct 26, 2006 at 08:47:08PM CEST, I got a letter\nwhere Marco Costalba <mcostalba@gmail.com> said that...\n> Also small code cleanup\n> \n> Signed-off-by: Marco Costalba <mcostalba@gmail.com>\n\n(It's whitespace-damaged.)\n\n> ---\n> \n> Still unable to push to public repo :(\n\nHey, we're using this beautiful distributed version control system,\naren't we? :-) We could make use of it being fully distributed for once,\ntoo - you can push to any other public repo until the original one\nbecomes available.\n\nThere's e.g. repo.or.cz. ;-)\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\n#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj\n$/=unpack('H*',$_);$_=`echo 16dio\\U$k\"SK$/SM$n\\EsN0p[lN*1\n"}]}