-rw-r--r-- | inputmethods/dasher/QtDasherScreen.cc | 3 | ||||
-rw-r--r-- | inputmethods/dasher/QtDasherScreen.h | 2 |
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 | |||
@@ -3,35 +3,32 @@ | |||
3 | // Derived from GtkDasherCanvas.cc | 3 | // Derived from GtkDasherCanvas.cc |
4 | // (c) 2002 Philip Cowans | 4 | // (c) 2002 Philip Cowans |
5 | 5 | ||
6 | #include <iostream> | 6 | #include <iostream> |
7 | #include <string> | 7 | #include <string> |
8 | 8 | ||
9 | #include <qpointarray.h> | 9 | #include <qpointarray.h> |
10 | #include <qpoint.h> | 10 | #include <qpoint.h> |
11 | 11 | ||
12 | #include "QtDasherScreen.h" | 12 | #include "QtDasherScreen.h" |
13 | #include "DasherScreen.h" | 13 | #include "DasherScreen.h" |
14 | #include "SettingsStore.h" | 14 | #include "SettingsStore.h" |
15 | 15 | ||
16 | #define MAXFONTSIZE 25 | 16 | #define MAXFONTSIZE 25 |
17 | #define MINFONTSIZE 8 | 17 | #define MINFONTSIZE 8 |
18 | 18 | ||
19 | #include <iconv.h> | ||
20 | #include <iostream> | ||
21 | |||
22 | QtDasherScreen::QtDasherScreen (int _width, int _height, | 19 | QtDasherScreen::QtDasherScreen (int _width, int _height, |
23 | CDasherInterface *_interface, | 20 | CDasherInterface *_interface, |
24 | QWidget * _parent, Dasher::CDashEditbox *edit): | 21 | QWidget * _parent, Dasher::CDashEditbox *edit): |
25 | QWidget(_parent), interface( _interface ), | 22 | QWidget(_parent), interface( _interface ), |
26 | fontname( "fixed" ), // fontsize(12), | 23 | fontname( "fixed" ), // fontsize(12), |
27 | Dasher::CDasherScreen(_width, _height) | 24 | Dasher::CDasherScreen(_width, _height) |
28 | { | 25 | { |
29 | // font = new QFont (fontname, fontsize); | 26 | // font = new QFont (fontname, fontsize); |
30 | painter = new QPainter (); | 27 | painter = new QPainter (); |
31 | 28 | ||
32 | pixmap = new QPixmap (_width, _height); | 29 | pixmap = new QPixmap (_width, _height); |
33 | pixmap->setOptimization(QPixmap::BestOptim); | 30 | pixmap->setOptimization(QPixmap::BestOptim); |
34 | interface->SetSettingsStore(new CSettingsStore); | 31 | interface->SetSettingsStore(new CSettingsStore); |
35 | 32 | ||
36 | interface->ChangeLanguageModel(0); | 33 | interface->ChangeLanguageModel(0); |
37 | interface->ChangeView(0); | 34 | interface->ChangeView(0); |
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 | |||
@@ -8,34 +8,32 @@ | |||
8 | 8 | ||
9 | #include <string> | 9 | #include <string> |
10 | #include <sys/time.h> | 10 | #include <sys/time.h> |
11 | 11 | ||
12 | #include <qwidget.h> | 12 | #include <qwidget.h> |
13 | #include <qpainter.h> | 13 | #include <qpainter.h> |
14 | #include <qfont.h> | 14 | #include <qfont.h> |
15 | #include <qstring.h> | 15 | #include <qstring.h> |
16 | #include <qpixmap.h> | 16 | #include <qpixmap.h> |
17 | #include <qtimer.h> | 17 | #include <qtimer.h> |
18 | #include <qcursor.h> | 18 | #include <qcursor.h> |
19 | 19 | ||
20 | #include "DasherScreen.h" | 20 | #include "DasherScreen.h" |
21 | #include "DashEdit.h" | 21 | #include "DashEdit.h" |
22 | #include "DasherInterface.h" | 22 | #include "DasherInterface.h" |
23 | 23 | ||
24 | #include <iconv.h> | ||
25 | |||
26 | using namespace Dasher; | 24 | using namespace Dasher; |
27 | 25 | ||
28 | class QtDasherScreen : public QWidget, public Dasher::CDasherScreen | 26 | class QtDasherScreen : public QWidget, public Dasher::CDasherScreen |
29 | 27 | ||
30 | { | 28 | { |
31 | Q_OBJECT | 29 | Q_OBJECT |
32 | public: | 30 | public: |
33 | QtDasherScreen (int _width, int _height, | 31 | QtDasherScreen (int _width, int _height, |
34 | CDasherInterface *_interface, | 32 | CDasherInterface *_interface, |
35 | QWidget * _parent=0, Dasher::CDashEditbox* edit=0); | 33 | QWidget * _parent=0, Dasher::CDashEditbox* edit=0); |
36 | QtDasherScreen::~QtDasherScreen(); | 34 | QtDasherScreen::~QtDasherScreen(); |
37 | 35 | ||
38 | void SetFont(std::string Name) | 36 | void SetFont(std::string Name) |
39 | { fontname = Name; /* set_the_font(); */ } | 37 | { fontname = Name; /* set_the_font(); */ } |
40 | 38 | ||
41 | void SetFontSize(Dasher::Opts::FontSize fontsize) | 39 | void SetFontSize(Dasher::Opts::FontSize fontsize) |