summaryrefslogtreecommitdiff
authormjg59 <mjg59>2003-12-10 03:58:39 (UTC)
committer mjg59 <mjg59>2003-12-10 03:58:39 (UTC)
commit9754061378940cf1d7637262305239deedc732b7 (patch) (side-by-side diff)
tree2263cbb1c298e1aea15e34399a5552562a42c36b
parentbecbcfae3bf3b5a714e7d3e39b924e08761739c2 (diff)
downloadopie-9754061378940cf1d7637262305239deedc732b7.zip
opie-9754061378940cf1d7637262305239deedc732b7.tar.gz
opie-9754061378940cf1d7637262305239deedc732b7.tar.bz2
Whoops, accidently added the includes back
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherScreen.cc3
-rw-r--r--inputmethods/dasher/QtDasherScreen.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc
index 7d77511..747b705 100644
--- a/inputmethods/dasher/QtDasherScreen.cc
+++ b/inputmethods/dasher/QtDasherScreen.cc
@@ -1,53 +1,50 @@
// 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 = QFont (fontname.c_str(), 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);
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h
index c029a60..06689d6 100644
--- a/inputmethods/dasher/QtDasherScreen.h
+++ b/inputmethods/dasher/QtDasherScreen.h
@@ -1,57 +1,55 @@
// 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 = font.pixelSize();
}
void DrawText(symbol Character, int x1, int y1, int Size) const