2 files changed, 0 insertions, 5 deletions

diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc
index 6820105..d05ef49 100644
--- a/inputmethods/dasher/QtDasherScreen.cc
+++ b/inputmethods/dasher/QtDasherScreen.cc
@@ -1,69 +1,66 @@
 // QtDasherScreen.cc
 // (c) 2003 Yann Dirson
 // Derived from GtkDasherCanvas.cc
 // (c) 2002 Philip Cowans
 
 #include <iostream>
 #include <string>
 
 #include <qpointarray.h>
 #include <qpoint.h>
 
 #include "QtDasherScreen.h"
 #include "DasherScreen.h"
 #include "SettingsStore.h"
 
 #define MAXFONTSIZE 25
 #define MINFONTSIZE 8
 
-#include <iconv.h>
-#include <iostream>
-
 QtDasherScreen::QtDasherScreen (int _width, int _height,
 				CDasherInterface *_interface,
 				QWidget * _parent, Dasher::CDashEditbox *edit):
   QWidget(_parent), interface( _interface ),
   fontname( "fixed" ), // fontsize(12),
   Dasher::CDasherScreen(_width, _height)
 {
   // font = new QFont (fontname, fontsize);
   painter = new QPainter ();
 
   pixmap = new QPixmap (_width, _height);
   pixmap->setOptimization(QPixmap::BestOptim);
   interface->SetSettingsStore(new CSettingsStore);
 
   interface->ChangeLanguageModel(0);
   interface->ChangeView(0);
   interface->ChangeEdit(edit);
 
   interface->GetFontSizes(&FontSizes);
 
   for (int i=0; i<FontSizes.size(); i++) {
     if (FontSizes[i]>Fonts.size())
       Fonts.resize((FontSizes[i])+1);    
     Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]);
     Fonts[FontSizes[i]].setPixelSize(FontSizes[i]);
   }
 
   interface->ChangeScreen(this);
 
   paused=true;
 		     
   QTimer *tmr = new QTimer(this);
   connect (tmr, SIGNAL(timeout()), SLOT(timer()));
   tmr->start(200);
 
 }
 
 long QtDasherScreen::get_time()
 {
   long s_now;
   long ms_now;
   
   struct timeval tv;
   struct timezone tz;
   
   gettimeofday( &tv, &tz );
   
   s_now = tv.tv_sec-1054487600;
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h
index f359113..c4d3b59 100644
--- a/inputmethods/dasher/QtDasherScreen.h
+++ b/inputmethods/dasher/QtDasherScreen.h
@@ -1,73 +1,71 @@
 // QtDasherScreen.h
 // (c) 2003 Yann Dirson
 // Derived from GtkDasherCanvas.h
 // (c) 2002 Philip Cowans
 
 #ifndef QT_DASHER_SCREEN_H
 #define QT_DASHER_SCREEN_H
 
 #include <string>
 #include <sys/time.h>
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qfont.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 #include <qcursor.h>
 
 #include "DasherScreen.h"
 #include "DashEdit.h"
 #include "DasherInterface.h"
 
-#include <iconv.h>
-
 using namespace Dasher;
 
 class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
 
 {
   Q_OBJECT
  public:
   QtDasherScreen (int _width, int _height,
 		  CDasherInterface *_interface,
 		  QWidget * _parent=0, Dasher::CDashEditbox* edit=0);
   QtDasherScreen::~QtDasherScreen();
 
   void SetFont(std::string Name)
     { fontname = Name; /* set_the_font(); */ }
 
   void SetFontSize(Dasher::Opts::FontSize fontsize)
     {
 #warning QtDasherScreen::SetFontSize() not implemented
     }
   Dasher::Opts::FontSize GetFontSize()
     {
 #warning QtDasherScreen::GetFontSize() not implemented
       return (Dasher::Opts::Normal);
     }
   
   void TextSize(symbol Character, int* Width, int* Height, int Size) const
     { 
       // should probably use QPainter::boundingRect()
       *Width = *Height = Fonts[Size].pixelSize();
       
     }
   void DrawText(symbol Character, int x1, int y1, int Size) const
     {
       //      QFont font = QFont (fontname.c_str(), Size);
       //      font.setPixelSize(Size);
       QPoint point = QPoint(x1, y1+Size/2);
   
       painter->setFont (Fonts[Size]);
       painter->drawText (point,
 			 QString(interface->GetDisplayText(Character).c_str()));
     }
 
   void DrawRectangle(int x1, int y1, int x2, int y2,
 		     int Color, Opts::ColorSchemes ColorScheme) const;
   void Polyline(point* Points, int Number) const;
   void DrawPolygon(point* Points, int Number, int Color,
 		   Opts::ColorSchemes ColorScheme) const;