3 files changed, 23 insertions, 19 deletions

diff --git a/noncore/multimedia/showimg/ImageFileSelector.cpp b/noncore/multimedia/showimg/ImageFileSelector.cpp
index 79ee925..53cc883 100644
--- a/noncore/multimedia/showimg/ImageFileSelector.cpp
+++ b/noncore/multimedia/showimg/ImageFileSelector.cpp
@@ -1,17 +1,19 @@
+#include "ImageFileSelector.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
-#include "qpe/qpeapplication.h"
-
-#include <stdlib.h>
-
-#include <qlabel.h>
+/* QT */
+#include <qlabel.h>   
 #include <qfileinfo.h>
 
-#include "ImageFileSelector.h"
-
+/* STD */
+#include <stdlib.h>
 
 ThumbWidget::ThumbWidget(QPixmap p,QString text,const DocLnk& f,QWidget *parent,int w)
         : QWidget( parent ),fl(f)
 {
     setBackgroundMode(NoBackground);  
     if ( w!=-1 )
@@ -152,13 +154,13 @@ void ImageFileSelector::updateSizes()
     background->setMinimumWidth(thumb->visibleWidth());
     thumb->updateScrollBars(); 
 }
 
 void ImageFileSelector::reread(bool)
 {
-//    qDebug("reread");
+//    odebug << "reread" << oendl; 
     ImageFileSelectorItem *item = (ImageFileSelectorItem *)detailed->selectedItem();
     QString oldFile;
     if ( item )
         oldFile = item->file().file();
     detailed->clear();
     tList.clear();
@@ -218,13 +220,13 @@ void ImageFileSelector::reread(bool)
 int ImageFileSelector::fileCount()
 {
     return count;
 }
 const DocLnk * ImageFileSelector::selected()
 {
-    qDebug("image selected");
+    odebug << "image selected" << oendl; 
     ImageFileSelectorItem *item = (ImageFileSelectorItem *) detailed->selectedItem();
     if ( item )
         return new DocLnk( item->file() );
     return 0;
 }
 
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index 696a57b..24377ed 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -23,29 +23,31 @@
 //
 
 #include "showimg.h"
 #include "ImageFileSelector.h"
 #include "settingsdialog.h"
 
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
-
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
-#include <qtoolbar.h>
+using namespace Opie::Core;
+using namespace Opie::Ui; 
 
+/* QT */
+#include <qtoolbar.h>
 #include <qaction.h>
 #include <qfiledialog.h>
 #include <qmenubar.h>
 #include <qspinbox.h>
 
+/* STD */
 #include <math.h>
 
-
-using namespace Opie::Ui;
 ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
         : QDialog(parent,0,true)
 {
     setCaption(caption);
 
     if ( parent )  {
@@ -283,13 +285,13 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ )
     ImageFileSelector::CURRENT_VIEW cv;
     if(showThumbView)
         cv=ImageFileSelector::THUMBNAIL;
     else
         cv=ImageFileSelector::DETAILED;
 
-    qDebug("cv = %d",cv);
+    odebug << "cv = " << cv << "" << oendl; 
 
     fileSelector = new ImageFileSelector( cv,stack, "fs");
 
     //switchThumbView();
 
 
@@ -410,13 +412,13 @@ void ImageViewer::settings()
     dlg.setRepeat( slideRepeat );
     dlg.setReverse( slideReverse );
     dlg.setRotate(rotateOnLoad);
     dlg.setFastLoad(fastLoad);
 
     if ( QPEApplication::execDialog(&dlg) == QDialog::Accepted ) {
-        qDebug("<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>");
+        odebug << "<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>" << oendl; 
         slideDelay = dlg.delay();
         slideRepeat = dlg.repeat();
         slideReverse = dlg.reverse();
         rotateOnLoad = dlg.rotate();
         fastLoad = dlg.fastLoad();
 
@@ -502,13 +504,13 @@ void ImageViewer::show()
     normalView();
     QMainWindow::show();
 }
 
 void ImageViewer::show(const QString& fileref)
 {
-//    qDebug("Show "+fileref);
+//    odebug << "Show "+fileref << oendl; 
     bFromDocView = TRUE;
     closeFileSelector();
     DocLnk link(fileref);
     if ( link.isValid() ) {
         openFile(link);
     } else {
@@ -532,13 +534,13 @@ void ImageViewer::openFile() {
 }
 
 void ImageViewer::openFile( const DocLnk &link )
 {
     closeFileSelector();
 //    DocLnk link(file);
-    qDebug("open "+link.name());
+    odebug << "open "+link.name() << oendl; 
     updateCaption( link.name() );
     loadImage( link.file() );
     if (slideTimer->isActive()) {
         slideTimer->start(slideDelay * 1000, FALSE);
     }
 
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index 6fd019e..c905da8 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -1,7 +1,7 @@
-CONFIG          += qt warn_on  quick-app
+CONFIG          += qt warn_on quick-app
 HEADERS   = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h
 SOURCES   = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp
 TARGET          = showimg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2