author | zecke <zecke> | 2004-08-14 15:43:08 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-14 15:43:08 (UTC) |
commit | 7657b6986a600ec1b3626c83e8f19036bf69e493 (patch) (unidiff) | |
tree | d8196d985a24663e9777dcc811f54b0eaf1abc9b /inputmethods | |
parent | 3df06db9e6fd268c7d234be05b01a2303dc0f7ba (diff) | |
download | opie-7657b6986a600ec1b3626c83e8f19036bf69e493.zip opie-7657b6986a600ec1b3626c83e8f19036bf69e493.tar.gz opie-7657b6986a600ec1b3626c83e8f19036bf69e493.tar.bz2 |
Do not delete the parent in dtor, when the parent called you for
destruction
-rw-r--r-- | inputmethods/dasher/QtDasherPlugin.cc | 2 | ||||
-rw-r--r-- | inputmethods/dasher/QtDasherScreen.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/inputmethods/dasher/QtDasherPlugin.cc b/inputmethods/dasher/QtDasherPlugin.cc index f491769..50d4539 100644 --- a/inputmethods/dasher/QtDasherPlugin.cc +++ b/inputmethods/dasher/QtDasherPlugin.cc | |||
@@ -32,13 +32,13 @@ QSize QtDasherPlugin::sizeHint() const | |||
32 | { | 32 | { |
33 | return QSize(240,100); | 33 | return QSize(240,100); |
34 | } | 34 | } |
35 | 35 | ||
36 | QtDasherPlugin::~QtDasherPlugin() | 36 | QtDasherPlugin::~QtDasherPlugin() |
37 | { | 37 | { |
38 | delete d; | 38 | delete interface; |
39 | } | 39 | } |
40 | 40 | ||
41 | void QtDasherPlugin::resetState() | 41 | void QtDasherPlugin::resetState() |
42 | { | 42 | { |
43 | flushcount=0; | 43 | flushcount=0; |
44 | interface->Start(); | 44 | interface->Start(); |
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 | |||
@@ -74,16 +74,14 @@ long QtDasherScreen::get_time() | |||
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: |