← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_kplotaxis_qreal.diff

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_kplotaxis_qreal.diff
1
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotaxis.cpp
 
1
Index: kdelibs-4.1.85/kdeui/plotting/kplotaxis.cpp
2
2
===================================================================
3
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotaxis.cpp   2008-05-21 11:08:26.000000000 +0000
4
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotaxis.cpp        2008-12-03 14:36:27.000000000 +0000
 
3
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotaxis.cpp    2008-12-11 18:13:25.000000000 +0100
 
4
+++ kdelibs-4.1.85/kdeui/plotting/kplotaxis.cpp 2008-12-11 18:15:14.000000000 +0100
5
5
@@ -44,7 +44,7 @@
6
6
         QString m_label; // The label of the axis.
7
7
         int m_labelFieldWidth; // Field width for number labels, see QString::arg()
80
80
 {
81
81
     return d->m_MinorTickMarks;
82
82
 }
83
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotaxis.h
 
83
Index: kdelibs-4.1.85/kdeui/plotting/kplotaxis.h
84
84
===================================================================
85
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotaxis.h     2008-05-21 11:08:26.000000000 +0000
86
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotaxis.h  2008-12-03 12:40:13.000000000 +0000
 
85
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotaxis.h      2008-12-11 18:13:26.000000000 +0100
 
86
+++ kdelibs-4.1.85/kdeui/plotting/kplotaxis.h   2008-12-11 18:15:14.000000000 +0100
87
87
@@ -23,6 +23,7 @@
88
88
 
89
89
 #include <kdeui_export.h>
128
128
 
129
129
 private:
130
130
     class Private;
131
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotobject.cpp
 
131
Index: kdelibs-4.1.85/kdeui/plotting/kplotobject.cpp
132
132
===================================================================
133
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotobject.cpp 2008-05-21 11:08:26.000000000 +0000
134
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotobject.cpp      2008-12-03 12:40:13.000000000 +0000
 
133
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotobject.cpp  2008-12-11 18:13:25.000000000 +0100
 
134
+++ kdelibs-4.1.85/kdeui/plotting/kplotobject.cpp       2008-12-11 18:15:14.000000000 +0100
135
135
@@ -46,12 +46,12 @@
136
136
         QList<KPlotPoint*> pList;
137
137
         PlotTypes type;
200
200
                 QRectF qr = QRectF( x1, y1, 2*size(), 2*size() );
201
201
     
202
202
                 //Mask out this rect in the plot for label avoidance
203
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotobject.h
 
203
Index: kdelibs-4.1.85/kdeui/plotting/kplotobject.h
204
204
===================================================================
205
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotobject.h   2008-05-21 11:08:26.000000000 +0000
206
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotobject.h        2008-12-03 12:40:13.000000000 +0000
 
205
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotobject.h    2008-12-11 18:13:25.000000000 +0100
 
206
+++ kdelibs-4.1.85/kdeui/plotting/kplotobject.h 2008-12-11 18:15:14.000000000 +0100
207
207
@@ -96,7 +96,7 @@
208
208
      * @param size the size to use for plotted points, in pixels
209
209
      * @param ps The PointStyle describing the shape for plotted points
247
247
 
248
248
     /**
249
249
      * Remove the QPointF at position index from the list of points
250
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotpoint.cpp
 
250
Index: kdelibs-4.1.85/kdeui/plotting/kplotpoint.cpp
251
251
===================================================================
252
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotpoint.cpp  2008-05-21 11:08:26.000000000 +0000
253
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotpoint.cpp       2008-12-03 12:40:13.000000000 +0000
 
252
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotpoint.cpp   2008-12-11 18:13:26.000000000 +0100
 
253
+++ kdelibs-4.1.85/kdeui/plotting/kplotpoint.cpp        2008-12-11 18:15:14.000000000 +0100
254
254
@@ -28,7 +28,7 @@
255
255
 class KPlotPoint::Private
256
256
 {
326
326
 {
327
327
     d->barWidth = w;
328
328
 }
329
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotpoint.h
 
329
Index: kdelibs-4.1.85/kdeui/plotting/kplotpoint.h
330
330
===================================================================
331
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotpoint.h    2008-05-21 11:08:26.000000000 +0000
332
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotpoint.h 2008-12-03 12:40:13.000000000 +0000
 
331
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotpoint.h     2008-12-11 18:13:26.000000000 +0100
 
332
+++ kdelibs-4.1.85/kdeui/plotting/kplotpoint.h  2008-12-11 18:15:14.000000000 +0100
333
333
@@ -53,7 +53,7 @@
334
334
      * @param width the bar width to use for this point (only used for
335
335
      * plots of type KPlotObject::Bars)
390
390
 
391
391
 private:
392
392
     class Private;
393
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotwidget.cpp
 
393
Index: kdelibs-4.1.85/kdeui/plotting/kplotwidget.cpp
394
394
===================================================================
395
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotwidget.cpp 2008-10-22 23:05:02.000000000 +0000
396
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotwidget.cpp      2008-12-03 12:40:13.000000000 +0000
 
395
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotwidget.cpp  2008-12-11 18:13:26.000000000 +0100
 
396
+++ kdelibs-4.1.85/kdeui/plotting/kplotwidget.cpp       2008-12-11 18:15:14.000000000 +0100
397
397
@@ -70,7 +70,7 @@
398
398
 
399
399
     KPlotWidget *q;
600
600
             }
601
601
         }
602
602
 
603
 
Index: kde4libs-4.1.80/kdeui/plotting/kplotwidget.h
 
603
Index: kdelibs-4.1.85/kdeui/plotting/kplotwidget.h
604
604
===================================================================
605
 
--- kde4libs-4.1.80.orig/kdeui/plotting/kplotwidget.h   2008-05-21 11:08:26.000000000 +0000
606
 
+++ kde4libs-4.1.80/kdeui/plotting/kplotwidget.h        2008-12-03 12:40:13.000000000 +0000
 
605
--- kdelibs-4.1.85.orig/kdeui/plotting/kplotwidget.h    2008-12-11 18:13:25.000000000 +0100
 
606
+++ kdelibs-4.1.85/kdeui/plotting/kplotwidget.h 2008-12-11 18:15:14.000000000 +0100
607
607
@@ -128,7 +128,7 @@
608
608
      * @param y1 the minimum Y value in data units
609
609
      * @param y2 the maximum Y value in data units