summaryrefslogtreecommitdiff
Unidiff
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
@@ -11,19 +11,16 @@
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
22QtDasherScreen::QtDasherScreen (int _width, int _height, 19QtDasherScreen::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 = QFont (fontname.c_str(), fontsize); 26 font = QFont (fontname.c_str(), fontsize);
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
@@ -16,18 +16,16 @@
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
26using namespace Dasher; 24using namespace Dasher;
27 25
28class QtDasherScreen : public QWidget, public Dasher::CDasherScreen 26class 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,