Diffstat (limited to 'inputmethods/dasher/QtDasherScreen.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/dasher/QtDasherScreen.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc index 2179cfb..b8a554c 100644 --- a/inputmethods/dasher/QtDasherScreen.cc +++ b/inputmethods/dasher/QtDasherScreen.cc | |||
@@ -56,52 +56,50 @@ QtDasherScreen::QtDasherScreen (int _width, int _height, | |||
56 | connect (tmr, SIGNAL(timeout()), SLOT(timer())); | 56 | connect (tmr, SIGNAL(timeout()), SLOT(timer())); |
57 | tmr->start(200); | 57 | tmr->start(200); |
58 | 58 | ||
59 | } | 59 | } |
60 | 60 | ||
61 | long QtDasherScreen::get_time() | 61 | long QtDasherScreen::get_time() |
62 | { | 62 | { |
63 | long s_now; | 63 | long s_now; |
64 | long ms_now; | 64 | long ms_now; |
65 | 65 | ||
66 | struct timeval tv; | 66 | struct timeval tv; |
67 | struct timezone tz; | 67 | struct timezone tz; |
68 | 68 | ||
69 | gettimeofday( &tv, &tz ); | 69 | gettimeofday( &tv, &tz ); |
70 | 70 | ||
71 | s_now = tv.tv_sec-1054487600; | 71 | s_now = tv.tv_sec-1054487600; |
72 | 72 | ||
73 | ms_now = tv.tv_usec / 1000; | 73 | ms_now = tv.tv_usec / 1000; |
74 | 74 | ||
75 | return( long(s_now*1000 + ms_now) ); | 75 | return( long(s_now*1000 + ms_now) ); |
76 | 76 | ||
77 | } | 77 | } |
78 | 78 | ||
79 | QtDasherScreen::~QtDasherScreen() | 79 | QtDasherScreen::~QtDasherScreen() |
80 | { | 80 | { |
81 | delete painter; | 81 | delete painter; |
82 | delete interface; | ||
83 | delete edit; | ||
84 | } | 82 | } |
85 | 83 | ||
86 | QColor QtDasherScreen::getColor(int Color, const Opts::ColorSchemes ColorScheme) const | 84 | QColor QtDasherScreen::getColor(int Color, const Opts::ColorSchemes ColorScheme) const |
87 | { | 85 | { |
88 | switch (ColorScheme) { | 86 | switch (ColorScheme) { |
89 | case Dasher::Opts::Nodes1: | 87 | case Dasher::Opts::Nodes1: |
90 | switch (Color) { | 88 | switch (Color) { |
91 | case 0: return QColor (180, 245, 180); | 89 | case 0: return QColor (180, 245, 180); |
92 | case 1: return QColor (160, 200, 160); | 90 | case 1: return QColor (160, 200, 160); |
93 | case 2: return QColor (0, 255, 255); | 91 | case 2: return QColor (0, 255, 255); |
94 | default: abort (); | 92 | default: abort (); |
95 | } | 93 | } |
96 | case Dasher::Opts::Nodes2: | 94 | case Dasher::Opts::Nodes2: |
97 | switch (Color) { | 95 | switch (Color) { |
98 | case 0: return QColor (255, 185, 255); | 96 | case 0: return QColor (255, 185, 255); |
99 | case 1: return QColor (140, 200, 255); | 97 | case 1: return QColor (140, 200, 255); |
100 | case 2: return QColor (255, 175, 175); | 98 | case 2: return QColor (255, 175, 175); |
101 | default: abort (); | 99 | default: abort (); |
102 | } | 100 | } |
103 | case Dasher::Opts::Special1: return QColor (240, 240, 240); | 101 | case Dasher::Opts::Special1: return QColor (240, 240, 240); |
104 | case Dasher::Opts::Special2: return QColor (255, 255, 255); | 102 | case Dasher::Opts::Special2: return QColor (255, 255, 255); |
105 | case Dasher::Opts::Groups: | 103 | case Dasher::Opts::Groups: |
106 | switch (Color) { | 104 | switch (Color) { |
107 | case 0: return QColor (255, 255, 0); | 105 | case 0: return QColor (255, 255, 0); |