Author: coolo
Date: Sun Dec 9 16:03:00 2007
New Revision: 42863
URL: http://svn.opensuse.org/viewcvs/yast?rev=42863&view=rev
Log:
remove some more Q3 stuff
Modified:
trunk/qt4/src/QY2ListView.h
trunk/qt4/src/YQMultiProgressMeter.cc
trunk/qt4/src/YQMultiSelectionBox.h
Modified: trunk/qt4/src/QY2ListView.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/QY2ListView.h?rev=42863&r1=42862&r2=42863&view=diff
==============================================================================
--- trunk/qt4/src/QY2ListView.h (original)
+++ trunk/qt4/src/QY2ListView.h Sun Dec 9 16:03:00 2007
@@ -36,7 +36,7 @@
/**
- * @short Enhanced Q3ListView
+ * @short Enhanced QTreeWidget
**/
class QY2ListView : public QTreeWidget
{
Modified: trunk/qt4/src/YQMultiProgressMeter.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQMultiProgressMeter.cc?rev=42863&r1=42862&r2=42863&view=diff
==============================================================================
--- trunk/qt4/src/YQMultiProgressMeter.cc (original)
+++ trunk/qt4/src/YQMultiProgressMeter.cc Sun Dec 9 16:03:00 2007
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include <QPointF>
#include "YQUI.h"
#include "YQMultiProgressMeter.h"
@@ -255,34 +255,32 @@
{
if ( fillStart < length )
{
- Q3PointArray points( 4 );
- int p=0;
-
- points.setPoint( p++, offset + fillStart, border + fillHeight );
- points.setPoint( p++, offset + fillStart, border + thickness - fillHeight );
- points.setPoint( p++, offset + length, border + thickness - indent );
- points.setPoint( p++, offset + length, border + indent );
+ static const QPointF points[4] =
+ { QPointF( offset + fillStart, border + fillHeight ),
+ QPointF( offset + fillStart, border + thickness - fillHeight ),
+ QPointF( offset + length, border + thickness - indent ),
+ QPointF( offset + length, border + indent )
+ };
painter.setBrush( palette().highlight() );
painter.setPen( Qt::NoPen );
- painter.drawConvexPolygon( points );
+ painter.drawConvexPolygon( points, 4 );
}
}
else // horizontal - fill from left to right like a normal progress bar
{
if ( fillStart > 0 )
{
- Q3PointArray points( 4 );
- int p=0;
-
- points.setPoint( p++, offset, border + thickness );
- points.setPoint( p++, offset, border );
- points.setPoint( p++, offset + fillStart, border + fillHeight );
- points.setPoint( p++, offset + fillStart, border + thickness - fillHeight );
+ static const QPointF points[4] =
+ { QPointF( offset, border + thickness ),
+ QPointF( offset, border ),
+ QPointF( offset + fillStart, border + fillHeight ),
+ QPointF( offset + fillStart, border + thickness - fillHeight )
+ };
painter.setBrush( palette().highlight() );
painter.setPen( Qt::NoPen );
- painter.drawConvexPolygon( points );
+ painter.drawConvexPolygon( points, 4 );
}
}
@@ -336,26 +334,27 @@
// Draw upper marker triangle
int tri = triThickness();
- Q3PointArray points( 3 );
-
- int p=0;
- points.setPoint( p++, offset - tri+1, margin() ); // top left (base)
- points.setPoint( p++, offset, margin() + tri-1 ); // lower center (point)
- points.setPoint( p++, offset + tri-1, margin() ); // top right (base)
+
+ static const QPointF points[3] =
+ { QPointF( offset - tri+1, margin() ), // top left (base)
+ QPointF( offset, margin() + tri-1 ), // lower center (point)
+ QPointF( offset + tri-1, margin() ) // top right (base)
+ };
- painter.drawConvexPolygon( points );
+ painter.drawConvexPolygon( points, 3 );
// Draw lower marker triangle
int pointOffset = margin() + tri + thickness + 2 * triSpacing();
- p=0;
- points.setPoint( p++, offset, pointOffset ); // top center (point)
- points.setPoint( p++, offset + tri-1, pointOffset + tri-1 ); // top right (base)
- points.setPoint( p++, offset - tri+1, pointOffset + tri-1 ); // bottom left (base)
+ static const QPointF points2[3] =
+ { QPointF( offset, pointOffset ), // top center (point)
+ QPointF( offset + tri-1, pointOffset + tri-1 ), // top right (base)
+ QPointF( offset - tri+1, pointOffset + tri-1 ) // bottom left (base)
+ };
- painter.drawConvexPolygon( points );
+ painter.drawConvexPolygon( points2, 3 );
}
Modified: trunk/qt4/src/YQMultiSelectionBox.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQMultiSelectionBox.h?rev=42863&r1=42862&r2=42863&view=diff
==============================================================================
--- trunk/qt4/src/YQMultiSelectionBox.h (original)
+++ trunk/qt4/src/YQMultiSelectionBox.h Sun Dec 9 16:03:00 2007
@@ -203,7 +203,7 @@
* Returns the sort key for any column.
* In this case, maintain item creation order.
*
- * Reimplemented from Q3ListViewItem.
+ * Reimplemented from QTreeWidgetItem
**/
virtual QString key ( int column,
bool ascending ) const;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
