1 files changed, 11 insertions, 9 deletions

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
@@ -17,41 +17,43 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 //
 // Full-screen and rotation options contributed by Robert Wittams <robert@wittams.com>
 //
 
 #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 )  {
         setPalette(parent->palette());
     }
 
     b=brightness;
     img=image;
 
@@ -277,25 +279,25 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ )
 
 
     imagePanel = new ImagePane( stack );
     connect(imagePanel, SIGNAL(clicked()), this, SLOT(normalView()));
 
 
     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();
 
 
     //fileSelector = new ImageFileSelector("image/*", stack, "fs");
     //fileSelector->setNewVisible(FALSE);
     //fileSelector->setCloseVisible(FALSE);
     connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( closeFileSelector() ) );
     connect( fileSelector, SIGNAL( fileSelected(const DocLnk&) ),
              this, SLOT( openFile(const DocLnk&) ) );
@@ -404,25 +406,25 @@ void ImageViewer::help() {
 
 
 void ImageViewer::settings()
 {
     SettingsDialog dlg( this, 0, TRUE );
     dlg.setDelay( slideDelay );
     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();
 
         Config config( "ImageViewer" );
         config.setGroup( "SlideShow" );
         config.writeEntry( "Delay", slideDelay );
         config.writeEntry( "Repeat", slideRepeat );
         config.writeEntry("Reverse", slideReverse);
 
@@ -496,25 +498,25 @@ void ImageViewer::doDelayedLoad()
 {
     show(delayLoad);
 }
 
 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 {
         filename = fileref;
         updateCaption( fileref );
         loadImage( fileref );
     }
 }
 
@@ -526,25 +528,25 @@ void ImageViewer::openFile() {
 
     QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
     DocLnk link(str);
 //    if ( link.isValid() )
         openFile(link);
 
 }
 
 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);
     }
 
 }
 
 void ImageViewer::open()
 {
     switchToFileSelector();
 }