1 files changed, 18 insertions, 13 deletions

diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 3c9a637..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -5,36 +5,41 @@
     begin                : November 2002
     copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free softwaSre; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation.                                         *
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
-#include <qaction.h>
-#include <qtoolbutton.h>
-#include <qmenubar.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
 
+#include "tinykate.h"
+
+#include "katedocument.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
 
-#include "tinykate.h"
+/* QT */
+#include <qaction.h>
+#include <qtoolbutton.h>
+#include <qmenubar.h>
 
-#include <katedocument.h>
-#include <kglobal.h>
 
 using namespace Opie::Ui;
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
 {
   shutDown=false;
   nextUnnamed=0;
   currentView=0;
   viewCount=0;
   setCaption(tr("TinyKATE"));
   KGlobal::setAppName("TinyKATE");
 
@@ -143,54 +148,54 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
 
 
         utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 );
         utilSettings->addTo( popup);
 
   if( qApp->argc() > 1) open(qApp->argv()[1]);
   else slotNew();
 
 }
 
 TinyKate::~TinyKate( )
 {
-  qWarning("TinyKate destructor\n");
+  owarn << "TinyKate destructor\n" << oendl;
 
   shutDown=true;
   while (currentView!=0) {
     slotClose();
   }
 
   if( KGlobal::config() != 0 ) {
-    qWarning("deleting KateConfig object..\n");
+    owarn << "deleting KateConfig object..\n" << oendl;
     delete KGlobal::config();
   }
 }
 
 void TinyKate::slotOpen( )
 {
     QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
                                                 QString::null);
   if (!filename.isEmpty()) {
     open(filename);
   }
 }
 
 void TinyKate::open(const QString & filename)
 {
     KateDocument *kd= new KateDocument(false, false, this,0,this);
     KTextEditor::View *kv;
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
-    qDebug(filename);
+    odebug << filename << oendl;
 
     kd->setDocName( filenamed);
     kd->open( filename );
     viewCount++;
 }
 
 void TinyKate::setDocument(const QString& fileref)
 {
     open( fileref );
 }
 
 void TinyKate::slotCurrentChanged( QWidget * view)
@@ -240,40 +245,40 @@ void TinyKate::slotClose( )
   tabwidget->removePage(dv);
   delete dv->document();
   viewCount--;
   if ((!viewCount) && (!shutDown))  slotNew();
 }
 
 void TinyKate::slotSave() {
   // feel free to make this how you want
   if (currentView==0) return;
 
   //  KateView *kv = (KateView*) currentView;
   KateDocument *kd = (KateDocument*) currentView->document();
-  //  qDebug("saving file "+kd->docName());
+  //  odebug << "saving file "+kd->docName() << oendl;
   if( kd->docName().isEmpty())
     slotSaveAs();
   else
      kd->saveFile();
   //    kv->save();
   //    kd->saveFile();
 }
 
 void TinyKate::slotSaveAs() {
   if (currentView==0) return;
   KateDocument *kd = (KateDocument*) currentView->document();
 
   QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
                                                  QString::null);
   if (!filename.isEmpty()) {
-    qDebug("saving file "+filename);
+    odebug << "saving file "+filename << oendl;
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     kd->setDocFile( filename);
     kd->setDocName( filenamed);
     kd->saveFile();
 //   KTextEditor::View *dv = currentView;
 //     tabwidget->changeTab( dv, filenamed);
     // need to change tab label here
   }
 
 }