summaryrefslogtreecommitdiff
path: root/libopie2/opieui
authormickeyl <mickeyl>2003-12-20 17:47:08 (UTC)
committer mickeyl <mickeyl>2003-12-20 17:47:08 (UTC)
commitd552ce3a94b53ae0fdb226411bd8f9e5bab6596a (patch) (unidiff)
treeca9f1edd3ed945c98a6cd4587a5094fe9b2b3d36 /libopie2/opieui
parent8e96eec63c67cfcd1fb202fe7346e5408a142f2e (diff)
downloadopie-d552ce3a94b53ae0fdb226411bd8f9e5bab6596a.zip
opie-d552ce3a94b53ae0fdb226411bd8f9e5bab6596a.tar.gz
opie-d552ce3a94b53ae0fdb226411bd8f9e5bab6596a.tar.bz2
- start cleaning up (lot of stuff left)
- use odebug classes
Diffstat (limited to 'libopie2/opieui') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/odialog.cpp16
-rw-r--r--libopie2/opieui/odialog.h10
-rw-r--r--libopie2/opieui/oimageeffect.cpp41
-rw-r--r--libopie2/opieui/olistview.cpp20
-rw-r--r--libopie2/opieui/opieui.pro22
-rw-r--r--libopie2/opieui/oseparator.cpp12
-rw-r--r--libopie2/opieui/oversatileview.cpp25
7 files changed, 75 insertions, 71 deletions
diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp
index 00a7a7e..4d269d4 100644
--- a/libopie2/opieui/odialog.cpp
+++ b/libopie2/opieui/odialog.cpp
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 4 =.
6 .=l. 5 .=l.
7           .>+-= 6           .>+-=
@@ -31,23 +30,26 @@
31 30
32#include <opie2/odialog.h> 31#include <opie2/odialog.h>
33 32
34int ODialog::mMarginSize = 5; // 11 like in KDialog is probably too much for PDA 33#warning Make Margin and Spacing device dependend and configurable!
35int ODialog::mSpacingSize = 2; // 6 like in KDialog is probably too much for PDA 34
35int ODialog::mMarginSize = 5;
36int ODialog::mSpacingSize = 2;
36 37
37ODialog::ODialog(QWidget *parent, const char *name, bool modal, WFlags f) 38ODialog::ODialog(QWidget *parent, const char *name, bool modal, WFlags f)
38 : QDialog(parent, name, modal, f) 39 :QDialog(parent, name, modal, f)
39{ 40{
41 // d = new ODialogPrivate();
40} 42}
41 43
42int ODialog::marginHint() 44int ODialog::marginHint()
43{ 45{
44 return( mMarginSize ); 46 return( mMarginSize );
45} 47}
46 48
47 49
48int ODialog::spacingHint() 50int ODialog::spacingHint()
49{ 51{
50 return( mSpacingSize ); 52 return( mSpacingSize );
51} 53}
52 54
53// Placeholder for even more sophisticed things 55// Placeholder for even more sophisticed things
diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h
index 4116ed7..ceff612 100644
--- a/libopie2/opieui/odialog.h
+++ b/libopie2/opieui/odialog.h
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3              (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4              (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 4 =.
6 .=l. 5 .=l.
7           .>+-= 6           .>+-=
@@ -49,9 +48,12 @@ class QLayoutItem;
49 * @ref marginHint() between the buttons and the separator and a 48 * @ref marginHint() between the buttons and the separator and a
50 * @ref marginHint() above the separator as well. 49 * @ref marginHint() above the separator as well.
51 * 50 *
52 * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 51 * @author Michael 'Mickey' Lauer <mickey@Vanille.de>
53 */ 52 */
53
54 // lets fix up Qt instead! Size does matter. -zecke 54 // lets fix up Qt instead! Size does matter. -zecke
55 // while that may be true, reducing maintainance effort for the future does also matter -
56 // and I believe that maintaining a patch against QtE is more work than our classes -mml
55 57
56class ODialog : public QDialog 58class ODialog : public QDialog
57{ 59{
@@ -83,7 +85,7 @@ class ODialog : public QDialog
83 static int mSpacingSize; 85 static int mSpacingSize;
84 86
85 class ODialogPrivate; 87 class ODialogPrivate;
86 ODialogPrivate *d; // d pointer always needed! -zecke 88 ODialogPrivate *d;
87 89
88}; 90};
89#endif // ODIALOG_H 91#endif // ODIALOG_H
diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp
index 01e7c6f..9a58bb9 100644
--- a/libopie2/opieui/oimageeffect.cpp
+++ b/libopie2/opieui/oimageeffect.cpp
@@ -34,7 +34,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34#include <qimage.h> 34#include <qimage.h>
35#include <stdlib.h> 35#include <stdlib.h>
36 36
37#include "oimageeffect.h" 37#include <opie2/oimageeffect.h>
38#include <opie2/odebug.h>
38 39
39#define MaxRGB 255L 40#define MaxRGB 255L
40#define DegreesToRadians(x) ((x)*M_PI/180.0) 41#define DegreesToRadians(x) ((x)*M_PI/180.0)
@@ -63,7 +64,7 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca,
63 QImage image(size, 32); 64 QImage image(size, 32);
64 65
65 if (size.width() == 0 || size.height() == 0) { 66 if (size.width() == 0 || size.height() == 0) {
66 qDebug( "WARNING: OImageEffect::gradient: invalid image" ); 67 odebug << "WARNING: OImageEffect::gradient: invalid image" << oendl;
67 return image; 68 return image;
68 } 69 }
69 70
@@ -349,7 +350,7 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca,
349 QImage image(size, 32); 350 QImage image(size, 32);
350 351
351 if (size.width() == 0 || size.height() == 0) { 352 if (size.width() == 0 || size.height() == 0) {
352 qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" ); 353 odebug << "WARNING: OImageEffect::unbalancedGradient : invalid image" << oendl;
353 return image; 354 return image;
354 } 355 }
355 356
@@ -568,7 +569,7 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca,
568QImage& OImageEffect::intensity(QImage &image, float percent) 569QImage& OImageEffect::intensity(QImage &image, float percent)
569{ 570{
570 if (image.width() == 0 || image.height() == 0) { 571 if (image.width() == 0 || image.height() == 0) {
571 qDebug( "WARNING: OImageEffect::intensity : invalid image" ); 572 odebug << "WARNING: OImageEffect::intensity : invalid image" << oendl;
572 return image; 573 return image;
573 } 574 }
574 575
@@ -633,7 +634,7 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent,
633 RGBComponent channel) 634 RGBComponent channel)
634{ 635{
635 if (image.width() == 0 || image.height() == 0) { 636 if (image.width() == 0 || image.height() == 0) {
636 qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" ); 637 odebug << "WARNING: OImageEffect::channelIntensity : invalid image" << oendl;
637 return image; 638 return image;
638 } 639 }
639 640
@@ -723,7 +724,7 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse,
723{ 724{
724 if (image.width() == 0 || image.height() == 0 || 725 if (image.width() == 0 || image.height() == 0 ||
725 modImage.width() == 0 || modImage.height() == 0) { 726 modImage.width() == 0 || modImage.height() == 0) {
726 qDebug( "WARNING: OImageEffect::modulate : invalid image" ); 727 odebug << "WARNING: OImageEffect::modulate : invalid image" << oendl;
727 return image; 728 return image;
728 } 729 }
729 730
@@ -852,7 +853,7 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity)
852 return dst; 853 return dst;
853 854
854 if (opacity < 0.0 || opacity > 1.0) { 855 if (opacity < 0.0 || opacity > 1.0) {
855 qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] "); 856 odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] " << oendl;
856 return dst; 857 return dst;
857 } 858 }
858 859
@@ -895,12 +896,12 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity)
895 return dst; 896 return dst;
896 897
897 if (src.width() != dst.width() || src.height() != dst.height()) { 898 if (src.width() != dst.width() || src.height() != dst.height()) {
898 qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" ); 899 odebug << "WARNING: OImageEffect::blend : src and destination images are not the same size" << oendl;
899 return dst; 900 return dst;
900 } 901 }
901 902
902 if (opacity < 0.0 || opacity > 1.0) { 903 if (opacity < 0.0 || opacity > 1.0) {
903 qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" ); 904 odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" << oendl;
904 return dst; 905 return dst;
905 } 906 }
906 907
@@ -940,7 +941,7 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
940 bool anti_dir) 941 bool anti_dir)
941{ 942{
942 if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { 943 if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) {
943 qDebug( "WARNING: OImageEffect::blend : invalid image" ); 944 odebug << "WARNING: OImageEffect::blend : invalid image" << oendl;
944 return image; 945 return image;
945 } 946 }
946 947
@@ -1133,7 +1134,7 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
1133 } 1134 }
1134 } 1135 }
1135 } 1136 }
1136 else qDebug( "OImageEffect::blend effect not implemented" ); 1137 else odebug << "OImageEffect::blend effect not implemented" << oendl;
1137 return image; 1138 return image;
1138} 1139}
1139 1140
@@ -1163,7 +1164,7 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2,
1163 if (image1.width() == 0 || image1.height() == 0 || 1164 if (image1.width() == 0 || image1.height() == 0 ||
1164 image2.width() == 0 || image2.height() == 0 || 1165 image2.width() == 0 || image2.height() == 0 ||
1165 blendImage.width() == 0 || blendImage.height() == 0) { 1166 blendImage.width() == 0 || blendImage.height() == 0) {
1166 qDebug( "OImageEffect::blend effect invalid image" ); 1167 odebug << "OImageEffect::blend effect invalid image" << oendl;
1167 return image1; 1168 return image1;
1168 } 1169 }
1169 1170
@@ -1261,7 +1262,7 @@ unsigned int OImageEffect::uHash(unsigned int c)
1261QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing) 1262QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing)
1262{ 1263{
1263 if (image.width() == 0 || image.height() == 0) { 1264 if (image.width() == 0 || image.height() == 0) {
1264 qDebug( "OImageEffect::hash effect invalid image" ); 1265 odebug << "OImageEffect::hash effect invalid image" << oendl;
1265 return image; 1266 return image;
1266 } 1267 }
1267 1268
@@ -1769,7 +1770,7 @@ bool OImageEffect::blend(
1769 lower.depth() != 32 1770 lower.depth() != 32
1770 ) 1771 )
1771 { 1772 {
1772 qDebug( "OImageEffect::blend : Sizes not correct" ); 1773 odebug << "OImageEffect::blend : Sizes not correct" << oendl;
1773 return false; 1774 return false;
1774 } 1775 }
1775 1776
@@ -1986,7 +1987,7 @@ void OImageEffect::normalize(QImage &img)
1986 histogram = (int *)calloc(MaxRGB+1, sizeof(int)); 1987 histogram = (int *)calloc(MaxRGB+1, sizeof(int));
1987 normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int)); 1988 normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int));
1988 if(!normalize_map || !histogram){ 1989 if(!normalize_map || !histogram){
1989 qWarning("Unable to allocate normalize histogram and map"); 1990 owarn << "Unable to allocate normalize histogram and map" << oendl;
1990 free(normalize_map); 1991 free(normalize_map);
1991 free(histogram); 1992 free(histogram);
1992 return; 1993 return;
@@ -2102,7 +2103,7 @@ void OImageEffect::equalize(QImage &img)
2102 equalize_map = (int *)malloc((MaxRGB+1)*sizeof(unsigned int)); 2103 equalize_map = (int *)malloc((MaxRGB+1)*sizeof(unsigned int));
2103 2104
2104 if(!histogram || !map || !equalize_map){ 2105 if(!histogram || !map || !equalize_map){
2105 qWarning("Unable to allocate equalize histogram and maps"); 2106 owarn << "Unable to allocate equalize histogram and maps" << oendl;
2106 free(histogram); 2107 free(histogram);
2107 free(map); 2108 free(map);
2108 free(equalize_map); 2109 free(equalize_map);
@@ -2187,7 +2188,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
2187 x_offset = (double *)malloc(w*sizeof(double)); 2188 x_offset = (double *)malloc(w*sizeof(double));
2188 y_offset = (double *)malloc(h*sizeof(double)); 2189 y_offset = (double *)malloc(h*sizeof(double));
2189 if(!x_offset || !y_offset){ 2190 if(!x_offset || !y_offset){
2190 qWarning("Unable to allocate pixels buffer"); 2191 owarn << "Unable to allocate pixels buffer" << oendl;
2191 free(x_offset); 2192 free(x_offset);
2192 free(y_offset); 2193 free(y_offset);
2193 return(src); 2194 return(src);
@@ -2205,7 +2206,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
2205 unsigned int *pixels; 2206 unsigned int *pixels;
2206 pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int)); 2207 pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int));
2207 if(!pixels){ 2208 if(!pixels){
2208 qWarning("Unable to allocate pixels buffer"); 2209 owarn << "Unable to allocate pixels buffer" << oendl;
2209 free(pixels); 2210 free(pixels);
2210 free(x_offset); 2211 free(x_offset);
2211 free(y_offset); 2212 free(y_offset);
@@ -2233,7 +2234,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
2233 unsigned char *pixels; 2234 unsigned char *pixels;
2234 pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char)); 2235 pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char));
2235 if(!pixels){ 2236 if(!pixels){
2236 qWarning("Unable to allocate pixels buffer"); 2237 owarn << "Unable to allocate pixels buffer" << oendl;
2237 free(pixels); 2238 free(pixels);
2238 free(x_offset); 2239 free(x_offset);
2239 free(y_offset); 2240 free(y_offset);
@@ -3072,7 +3073,7 @@ QImage OImageEffect::oilPaint(QImage &src, int radius)
3072{ 3073{
3073 // TODO 8bpp src! 3074 // TODO 8bpp src!
3074 if(src.depth() < 32){ 3075 if(src.depth() < 32){
3075 qWarning("Oil Paint source image < 32bpp. Convert before using!"); 3076 owarn << "Oil Paint source image < 32bpp. Convert before using!" << oendl;
3076 return(src); 3077 return(src);
3077 } 3078 }
3078 int j, k, i, x, y; 3079 int j, k, i, x, y;
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index ec503dd..38f3fe2 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3 =. (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4 =. (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 .=l. 4 .=l.
6           .>+-= 5           .>+-=
7 _;:,     .>    :=|. This program is free software; you can 6 _;:,     .>    :=|. This program is free software; you can
@@ -37,6 +36,7 @@
37 36
38/* OPIE */ 37/* OPIE */
39 38
39#include <opie2/odebug.h>
40#include <opie2/olistview.h> 40#include <opie2/olistview.h>
41 41
42/*====================================================================================== 42/*======================================================================================
@@ -142,7 +142,7 @@ OListViewItem* OListView::childFactory()
142void OListView::serializeTo( QDataStream& s ) const 142void OListView::serializeTo( QDataStream& s ) const
143{ 143{
144 #warning Caution... the binary format is still under construction... 144 #warning Caution... the binary format is still under construction...
145 qDebug( "storing OListView..." ); 145 odebug << "storing OListView..." << oendl;
146 146
147 // store number of columns and the labels 147 // store number of columns and the labels
148 s << columns(); 148 s << columns();
@@ -167,13 +167,13 @@ void OListView::serializeTo( QDataStream& s ) const
167 item = item->nextSibling(); 167 item = item->nextSibling();
168 } 168 }
169 169
170 qDebug( "OListview stored." ); 170 odebug << "OListview stored." << oendl;
171} 171}
172 172
173void OListView::serializeFrom( QDataStream& s ) 173void OListView::serializeFrom( QDataStream& s )
174{ 174{
175 #warning Caution... the binary format is still under construction... 175 #warning Caution... the binary format is still under construction...
176 qDebug( "loading OListView..." ); 176 odebug << "loading OListView..." << oendl;
177 177
178 int cols; 178 int cols;
179 s >> cols; 179 s >> cols;
@@ -199,7 +199,7 @@ void OListView::serializeFrom( QDataStream& s )
199 s >> *item; 199 s >> *item;
200 } 200 }
201 201
202 qDebug( "OListView loaded." ); 202 odebug << "OListView loaded." << oendl;
203 203
204} 204}
205 205
@@ -377,7 +377,7 @@ OListViewItem* OListViewItem::childFactory()
377void OListViewItem::serializeTo( QDataStream& s ) const 377void OListViewItem::serializeTo( QDataStream& s ) const
378{ 378{
379 #warning Caution... the binary format is still under construction... 379 #warning Caution... the binary format is still under construction...
380 qDebug( "storing OListViewItem..." ); 380 odebug << "storing OListViewItem..." << oendl;
381 381
382 // store item text 382 // store item text
383 for ( int i = 0; i < listView()->columns(); ++i ) 383 for ( int i = 0; i < listView()->columns(); ++i )
@@ -403,14 +403,14 @@ void OListViewItem::serializeTo( QDataStream& s ) const
403 item = item->nextSibling(); 403 item = item->nextSibling();
404 } 404 }
405 405
406 qDebug( "OListviewItem stored." ); 406 odebug << "OListviewItem stored." << oendl;
407} 407}
408 408
409 409
410void OListViewItem::serializeFrom( QDataStream& s ) 410void OListViewItem::serializeFrom( QDataStream& s )
411{ 411{
412 #warning Caution... the binary format is still under construction... 412 #warning Caution... the binary format is still under construction...
413 qDebug( "loading OListViewItem..." ); 413 odebug << "loading OListViewItem..." << oendl;
414 414
415 for ( int i = 0; i < listView()->columns(); ++i ) 415 for ( int i = 0; i < listView()->columns(); ++i )
416 { 416 {
@@ -430,7 +430,7 @@ void OListViewItem::serializeFrom( QDataStream& s )
430 s >> (*item); 430 s >> (*item);
431 } 431 }
432 432
433 qDebug( "OListViewItem loaded." ); 433 odebug << "OListViewItem loaded." << oendl;
434} 434}
435 435
436 436
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index b455602..61f9bbb 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -10,9 +10,10 @@ HEADERS = olistview.h \
10 oversatileview.h \ 10 oversatileview.h \
11 oversatileviewitem.h \ 11 oversatileviewitem.h \
12 odialog.h \ 12 odialog.h \
13 omessagebox.h \ 13 omessagebox.h \
14 oresource.h \ 14 oresource.h \
15 oseparator.h 15 otaskbarapplet.h \
16 oseparator.h
16 17
17SOURCES = olistview.cpp \ 18SOURCES = olistview.cpp \
18 oimageeffect.cpp \ 19 oimageeffect.cpp \
@@ -23,27 +24,24 @@ SOURCES = olistview.cpp \
23 oversatileview.cpp \ 24 oversatileview.cpp \
24 oversatileviewitem.cpp \ 25 oversatileviewitem.cpp \
25 odialog.cpp \ 26 odialog.cpp \
26 oresource.cpp \ 27 oresource.cpp \
27 oseparator.cpp 28 otaskbarapplet.cpp \
29 oseparator.cpp
28 30
29INTERFACES = 31INTERFACES =
30TARGET = opieui2 32TARGET = opieui2
31VERSION = 1.8.2 33VERSION = 1.8.2
34
32INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
33DEPENDPATH += $(OPIEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
34LIBS += -lopiecore2
35MOC_DIR = moc
36OBJECTS_DIR = obj
37 37
38LIBS += -lopiecore2
38 39
39!contains( platform, x11 ) { 40!contains( platform, x11 ) {
40 include ( $(OPIEDIR)/include.pro ) 41 include ( $(OPIEDIR)/include.pro )
41 HEADERS += otaskbarapplet.h
42 SOURCES += otaskbarapplet.cpp
43} 42}
44 43
45contains( platform, x11 ) { 44contains( platform, x11 ) {
46 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 45 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
47 message( Warning: NO otaskbarapplet ATM )
48} 46}
49 47
diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp
index 85181dc..98d42c7 100644
--- a/libopie2/opieui/oseparator.cpp
+++ b/libopie2/opieui/oseparator.cpp
@@ -1,6 +1,5 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3
4              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 Copyright (C) 1997 Michael Roth <mroth@wirlweb.de> 4 Copyright (C) 1997 Michael Roth <mroth@wirlweb.de>
6 =. 5 =.
@@ -30,14 +29,15 @@
30 29
31*/ 30*/
32 31
33/* QT */
34
35#include <qstyle.h>
36
37/* OPIE */ 32/* OPIE */
38 33
34#include <opie2/odebug.h>
39#include <opie2/oseparator.h> 35#include <opie2/oseparator.h>
40 36
37/* QT */
38
39#include <qstyle.h>
40
41OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f) 41OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f)
42 : QFrame(parent, name, f) 42 : QFrame(parent, name, f)
43{ 43{
@@ -69,7 +69,7 @@ void OSeparator::setOrientation(int orientation)
69 break; 69 break;
70 70
71 default: 71 default:
72 qWarning( "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" ); 72 owarn << "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" << oendl;
73 73
74 case Horizontal: 74 case Horizontal:
75 case HLine: 75 case HLine:
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 6808539..65fe3d8 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -28,6 +28,13 @@
28 28
29*/ 29*/
30 30
31/* OPIE */
32
33#include <opie2/odebug.h>
34#include <opie2/oversatileview.h>
35#include <opie2/oversatileviewitem.h>
36#include <opie2/olistview.h>
37
31/* QT */ 38/* QT */
32 39
33#include <qaction.h> 40#include <qaction.h>
@@ -44,12 +51,6 @@
44#include <qstring.h> 51#include <qstring.h>
45#include <qwidgetstack.h> 52#include <qwidgetstack.h>
46 53
47/* OPIE */
48
49#include <opie2/oversatileview.h>
50#include <opie2/oversatileviewitem.h>
51#include <opie2/olistview.h>
52
53/* XPM */ 54/* XPM */
54static const char * view_icon_xpm[] = { 55static const char * view_icon_xpm[] = {
55"16 16 16 1", 56"16 16 16 1",
@@ -289,7 +290,7 @@ void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened
289 } 290 }
290 else 291 else
291 { 292 {
292 qDebug( "OVersatileView::setDefaultPixmaps(): invalid mode" ); 293 odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl;
293 } 294 }
294} 295}
295 296
@@ -317,7 +318,7 @@ void OVersatileView::setViewMode( int mode )
317 } 318 }
318 else 319 else
319 { 320 {
320 qDebug( "OVersatileView::setViewMode(): invalid mode" ); 321 odebug << "OVersatileView::setViewMode(): invalid mode" << oendl;
321 } 322 }
322} 323}
323 324
@@ -343,7 +344,7 @@ bool OVersatileView::isValidViewMode( int mode ) const
343 { 344 {
344 if ( _viewmode != mode ) 345 if ( _viewmode != mode )
345 { 346 {
346 qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); 347 odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl;
347 return true; 348 return true;
348 } 349 }
349 } 350 }
@@ -351,13 +352,13 @@ bool OVersatileView::isValidViewMode( int mode ) const
351 { 352 {
352 if ( _viewmode != mode ) 353 if ( _viewmode != mode )
353 { 354 {
354 qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); 355 odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl;
355 return false; 356 return false;
356 } 357 }
357 } 358 }
358 default: 359 default:
359 { 360 {
360 qWarning( "OVersatileView::isValidViewMode(): Inconsistent object state!" ); 361 owarn << "OVersatileView::isValidViewMode(): Inconsistent object state!" << oendl;
361 return true; 362 return true;
362 } 363 }
363 } 364 }
@@ -448,7 +449,7 @@ void OVersatileView::onItem( QIconViewItem * item )
448 449
449void OVersatileView::expanded( QListViewItem *item ) // QListView 450void OVersatileView::expanded( QListViewItem *item ) // QListView
450{ 451{
451 //qDebug( "OVersatileView::expanded(): opening tree..." ); 452 //odebug << "OVersatileView::expanded(): opening tree..." << oendl;
452 if ( !_treeopened.isNull() ) 453 if ( !_treeopened.isNull() )
453 item->setPixmap( 0, _treeopened ); 454 item->setPixmap( 0, _treeopened );
454 emit( expanded( static_cast<OVersatileViewItem*>( item ) ) ); 455 emit( expanded( static_cast<OVersatileViewItem*>( item ) ) );