author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/graphics | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
-rw-r--r-- | noncore/graphics/opie-eye/config.in | 4 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp | 14 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/dir/dir_lister.cpp | 8 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/lib/slavemaster.cpp | 12 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/phunk_view.pro | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/jpeg_slave.cpp | 18 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/main.cpp | 16 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slave.pro | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 22 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/thumbnailtool.cpp | 11 |
10 files changed, 68 insertions, 45 deletions
diff --git a/noncore/graphics/opie-eye/config.in b/noncore/graphics/opie-eye/config.in index 996dcf3..d7f9963 100644 --- a/noncore/graphics/opie-eye/config.in +++ b/noncore/graphics/opie-eye/config.in | |||
@@ -3,3 +3,3 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 4 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | 5 | ||
@@ -8,2 +8,2 @@ | |||
8 | default "y" if OPIE_EYE | 8 | default "y" if OPIE_EYE |
9 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 9 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp index 79f4510..5599ad1 100644 --- a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp +++ b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp | |||
@@ -5,2 +5,10 @@ | |||
5 | 5 | ||
6 | #include "dir_ifaceinfo.h" | ||
7 | |||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
10 | #include <qpe/config.h> | ||
11 | using namespace Opie::Core; | ||
12 | |||
13 | /* QT */ | ||
6 | #include <qwidget.h> | 14 | #include <qwidget.h> |
@@ -10,6 +18,2 @@ | |||
10 | 18 | ||
11 | #include <qpe/config.h> | ||
12 | |||
13 | #include "dir_ifaceinfo.h" | ||
14 | |||
15 | namespace { | 19 | namespace { |
@@ -43,3 +47,3 @@ QWidget* DirInterfaceInfo::configWidget(const Config& cfg) { | |||
43 | void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) { | 47 | void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) { |
44 | qWarning( "Write Config" ); | 48 | owarn << "Write Config" << oendl; |
45 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); | 49 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); |
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp index ffea29e..0a5cff4 100644 --- a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp +++ b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp | |||
@@ -8,6 +8,9 @@ | |||
8 | 8 | ||
9 | 9 | /* OPIE */ | |
10 | #include <opie2/odebug.h> | ||
10 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
11 | #include <qpe/qpeapplication.h> | 12 | #include <qpe/qpeapplication.h> |
13 | using namespace Opie::Core; | ||
12 | 14 | ||
15 | /* QT */ | ||
13 | #include <qdir.h> | 16 | #include <qdir.h> |
@@ -15,3 +18,2 @@ | |||
15 | 18 | ||
16 | |||
17 | Dir_DirLister::Dir_DirLister( bool list ) | 19 | Dir_DirLister::Dir_DirLister( bool list ) |
@@ -20,3 +22,3 @@ Dir_DirLister::Dir_DirLister( bool list ) | |||
20 | m_allFiles = list; | 22 | m_allFiles = list; |
21 | qWarning("All Files %d", m_allFiles ); | 23 | owarn << "All Files " << m_allFiles << "" << oendl; |
22 | 24 | ||
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp index 4e28535..5bb7ab8 100644 --- a/noncore/graphics/opie-eye/lib/slavemaster.cpp +++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp | |||
@@ -2,5 +2,9 @@ | |||
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
3 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
4 | #include <qpe/qcopenvelope_qws.h> | 6 | #include <qpe/qcopenvelope_qws.h> |
7 | using namespace Opie::Core; | ||
5 | 8 | ||
9 | /* QT */ | ||
6 | #include <qcopchannel_qws.h> | 10 | #include <qcopchannel_qws.h> |
@@ -25,3 +29,3 @@ QDataStream & operator >> (QDataStream & str, bool & b) | |||
25 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | 29 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { |
26 | qWarning( "Image request is %s %d %d", inf.file.latin1(), inf.width, inf.height ); | 30 | owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
27 | return s << inf.file << inf.width << inf.height; | 31 | return s << inf.file << inf.width << inf.height; |
@@ -80,6 +84,6 @@ void SlaveMaster::thumbNail( const QString& str, int w, int h ) { | |||
80 | if ( str.isEmpty() ) { | 84 | if ( str.isEmpty() ) { |
81 | qWarning( "Asking for empty nail" ); | 85 | owarn << "Asking for empty nail" << oendl; |
82 | return; | 86 | return; |
83 | } | 87 | } |
84 | qWarning( "Asking for thumbNail in size %d %d" + str, w,h ); | 88 | owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; |
85 | PixmapInfo item; | 89 | PixmapInfo item; |
@@ -107,3 +111,3 @@ void SlaveMaster::recieve( const QCString& str, const QByteArray& at) { | |||
107 | 111 | ||
108 | qWarning( "PixInfos %d", pixinfos.count() ); | 112 | owarn << "PixInfos " << pixinfos.count() << "" << oendl; |
109 | 113 | ||
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro index 17fa22c..0e2202a 100644 --- a/noncore/graphics/opie-eye/phunk_view.pro +++ b/noncore/graphics/opie-eye/phunk_view.pro | |||
@@ -33,3 +33,3 @@ DEPENDPATH += $(OPIEDIR)/include | |||
33 | 33 | ||
34 | LIBS += -lqpe -lopieui2 | 34 | LIBS += -lqpe -lopiecore2 -lopieui2 |
35 | 35 | ||
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp index 086b47f..fb7d5de 100644 --- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp +++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "jpeg_slave.h" | 1 | #include "jpeg_slave.h" |
2 | |||
3 | #include "thumbnailtool.h" | 2 | #include "thumbnailtool.h" |
@@ -6,3 +5,8 @@ PHUNK_VIEW_INTERFACE( "JPEG", JpegSlave ) | |||
6 | 5 | ||
7 | #include <qtopia/timestring.h> | 6 | /* OPIE */ |
7 | #include <opie2/odebug.h> | ||
8 | #include <qpe/timestring.h> | ||
9 | using namespace Opie::Core; | ||
10 | |||
11 | /* QT */ | ||
8 | #include <qobject.h> | 12 | #include <qobject.h> |
@@ -121,3 +125,3 @@ public: | |||
121 | FatalError(const char* s) { ex = s; } | 125 | FatalError(const char* s) { ex = s; } |
122 | void debug_print() const { qWarning("exception: %s", ex ); } | 126 | void debug_print() const { owarn << "exception: " << ex << "" << oendl; } |
123 | }; | 127 | }; |
@@ -264,3 +268,3 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) | |||
264 | 268 | ||
265 | qWarning( "too many padding bytes" ); | 269 | owarn << "too many padding bytes" << oendl; |
266 | return false; | 270 | return false; |
@@ -329,3 +333,3 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) | |||
329 | case M_EOI: // in case it's a tables-only JPEG stream | 333 | case M_EOI: // in case it's a tables-only JPEG stream |
330 | qWarning( "No image in jpeg!" ); | 334 | owarn << "No image in jpeg!" << oendl; |
331 | return false; | 335 | return false; |
@@ -728,3 +732,3 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa | |||
728 | // I'll just let it pass silently | 732 | // I'll just let it pass silently |
729 | qWarning( "Thumbnail removed with Jhead 1.3 or earlier" ); | 733 | owarn << "Thumbnail removed with Jhead 1.3 or earlier" << oendl; |
730 | }else{ | 734 | }else{ |
@@ -915,3 +919,3 @@ bool ExifData::scan(const QString & path) | |||
915 | if (ret == false){ | 919 | if (ret == false){ |
916 | qWarning( "Not JPEG file!" ); | 920 | owarn << "Not JPEG file!" << oendl; |
917 | DiscardData(); | 921 | DiscardData(); |
diff --git a/noncore/graphics/opie-eye/slave/main.cpp b/noncore/graphics/opie-eye/slave/main.cpp index 37020e6..5b90483 100644 --- a/noncore/graphics/opie-eye/slave/main.cpp +++ b/noncore/graphics/opie-eye/slave/main.cpp | |||
@@ -33,8 +33,8 @@ int main( int argc, char* argv[] ) { | |||
33 | GifSlave slave; | 33 | GifSlave slave; |
34 | qWarning( str +" "+slave.iconViewName(str ) ); | 34 | owarn << str +" "+slave.iconViewName(str ) << oendl; |
35 | qWarning( str+" "+slave.fullImageInfo( str ) ); | 35 | owarn << str+" "+slave.fullImageInfo( str ) << oendl; |
36 | 36 | ||
37 | PNGSlave pngslave; | 37 | PNGSlave pngslave; |
38 | qWarning( str + " " + pngslave.iconViewName(str) ); | 38 | owarn << str + " " + pngslave.iconViewName(str) << oendl; |
39 | qWarning( str + " " + pngslave.fullImageInfo(str)); | 39 | owarn << str + " " + pngslave.fullImageInfo(str) << oendl; |
40 | 40 | ||
@@ -42,4 +42,4 @@ int main( int argc, char* argv[] ) { | |||
42 | JpegSlave jpgslave; | 42 | JpegSlave jpgslave; |
43 | qWarning( str + " " + jpgslave.iconViewName(str ) ); | 43 | owarn << str + " " + jpgslave.iconViewName(str ) << oendl; |
44 | qWarning( str + " " + jpgslave.fullImageInfo( str ) ); | 44 | owarn << str + " " + jpgslave.fullImageInfo( str ) << oendl; |
45 | //return app.exec(); | 45 | //return app.exec(); |
@@ -47,3 +47,3 @@ int main( int argc, char* argv[] ) { | |||
47 | if ( pix.isNull() ) { | 47 | if ( pix.isNull() ) { |
48 | qWarning( "No Thumbnail" ); | 48 | owarn << "No Thumbnail" << oendl; |
49 | pix = slave.pixmap(str, 24, 24); | 49 | pix = slave.pixmap(str, 24, 24); |
@@ -52,3 +52,3 @@ int main( int argc, char* argv[] ) { | |||
52 | if (!pix.isNull() ) { | 52 | if (!pix.isNull() ) { |
53 | qWarning( "Saving Thumbnail" ); | 53 | owarn << "Saving Thumbnail" << oendl; |
54 | ThumbNailTool::putThumb( str, pix, 24, 24 ); | 54 | ThumbNailTool::putThumb( str, pix, 24, 24 ); |
diff --git a/noncore/graphics/opie-eye/slave/slave.pro b/noncore/graphics/opie-eye/slave/slave.pro index 3f42495..903d667 100644 --- a/noncore/graphics/opie-eye/slave/slave.pro +++ b/noncore/graphics/opie-eye/slave/slave.pro | |||
@@ -1,2 +1,2 @@ | |||
1 | CONFIG += qte | 1 | CONFIG = qt |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
@@ -15,4 +15,4 @@ DEPENDSPATH += $(OPIEDIR)/include | |||
15 | 15 | ||
16 | LIBS += -lqpe | 16 | LIBS += -lqpe -lopiecore2 |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index bbbbb30..82b3d23 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp | |||
@@ -7,5 +7,9 @@ | |||
7 | 7 | ||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
8 | #include <qpe/qcopenvelope_qws.h> | 10 | #include <qpe/qcopenvelope_qws.h> |
9 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | using namespace Opie::Core; | ||
10 | 13 | ||
14 | /* QT */ | ||
11 | #include <qtimer.h> | 15 | #include <qtimer.h> |
@@ -39,3 +43,3 @@ QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | |||
39 | s >> inf.file >> inf.width >> inf.height; | 43 | s >> inf.file >> inf.width >> inf.height; |
40 | qWarning( "Recieved %s %d %d", inf.file.latin1(), inf.width, inf.height ); | 44 | owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
41 | return s; | 45 | return s; |
@@ -84,3 +88,3 @@ SlaveReciever::~SlaveReciever() { | |||
84 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { | 88 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { |
85 | qWarning( "String is %s", string.data() ); | 89 | owarn << "String is " << string.data() << "" << oendl; |
86 | QDataStream stream(ar, IO_ReadOnly ); | 90 | QDataStream stream(ar, IO_ReadOnly ); |
@@ -96,3 +100,3 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
96 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 100 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
97 | qWarning( "Adding thumbinfo for file "+ *it ); | 101 | owarn << "Adding thumbinfo for file "+ *it << oendl; |
98 | inf.file = (*it); | 102 | inf.file = (*it); |
@@ -107,3 +111,3 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
107 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 111 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
108 | qWarning( "Adding fullInfo for"+ *it ); | 112 | owarn << "Adding fullInfo for"+ *it << oendl; |
109 | inf.file = (*it); | 113 | inf.file = (*it); |
@@ -119,3 +123,3 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
119 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { | 123 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { |
120 | qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height ); | 124 | owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; |
121 | m_inPix.append(*it); | 125 | m_inPix.append(*it); |
@@ -183,3 +187,3 @@ void SlaveReciever::slotThumbNail() { | |||
183 | /* pixmap */ | 187 | /* pixmap */ |
184 | qWarning( "Asking for thumbNail in size %d %d for "+inf.file, inf.width, inf.height ); | 188 | owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; |
185 | inf.pixmap = iface->pixmap(inf.file, 64, 64); | 189 | inf.pixmap = iface->pixmap(inf.file, 64, 64); |
@@ -202,3 +206,3 @@ void SlaveReciever::slotSend() { | |||
202 | 206 | ||
203 | qWarning( "Sending %d %d", outPix().count(), outInf().count() ); | 207 | owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; |
204 | /* queue it and send */ | 208 | /* queue it and send */ |
@@ -211,3 +215,3 @@ void SlaveReciever::slotSend() { | |||
211 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { | 215 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { |
212 | qWarning( "Sending out %s %d %d", (*it).file.latin1(), (*it).width, (*it).height ); | 216 | owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; |
213 | } | 217 | } |
@@ -218,3 +222,3 @@ void SlaveReciever::slotSend() { | |||
218 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { | 222 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { |
219 | qWarning( "Sending out2 " + (*it).file ); | 223 | owarn << "Sending out2 " + (*it).file << oendl; |
220 | } | 224 | } |
diff --git a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp index a202457..d2e169c 100644 --- a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp +++ b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp | |||
@@ -2,2 +2,7 @@ | |||
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
3 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
@@ -28,3 +33,3 @@ QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) { | |||
28 | QFileInfo inf( path ); | 33 | QFileInfo inf( path ); |
29 | qWarning( "Get Thumb" ); | 34 | owarn << "Get Thumb" << oendl; |
30 | if ( !makeThumbDir( inf ) ) { | 35 | if ( !makeThumbDir( inf ) ) { |
@@ -34,3 +39,3 @@ QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) { | |||
34 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); | 39 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); |
35 | qWarning( inf.dirPath()+str ); | 40 | owarn << inf.dirPath()+str << oendl; |
36 | return QPixmap( inf.dirPath()+str,"PNG" ); | 41 | return QPixmap( inf.dirPath()+str,"PNG" ); |
@@ -43,3 +48,3 @@ void ThumbNailTool::putThumb( const QString& path, const QPixmap& pix, int width | |||
43 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); | 48 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); |
44 | qWarning( inf.dirPath()+str ); | 49 | owarn << inf.dirPath()+str << oendl; |
45 | pix.save( inf.dirPath()+str, "PNG" ); | 50 | pix.save( inf.dirPath()+str, "PNG" ); |