author | zecke <zecke> | 2004-08-14 15:43:08 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-14 15:43:08 (UTC) |
commit | 7657b6986a600ec1b3626c83e8f19036bf69e493 (patch) (side-by-side diff) | |
tree | d8196d985a24663e9777dcc811f54b0eaf1abc9b | |
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 @@ -30,17 +30,17 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF QSize QtDasherPlugin::sizeHint() const { return QSize(240,100); } QtDasherPlugin::~QtDasherPlugin() { - delete d; + delete interface; } void QtDasherPlugin::resetState() { flushcount=0; interface->Start(); interface->Redraw(); } 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 @@ -72,20 +72,18 @@ long QtDasherScreen::get_time() ms_now = tv.tv_usec / 1000; return( long(s_now*1000 + ms_now) ); } QtDasherScreen::~QtDasherScreen() -{ +{ delete painter; - delete interface; - delete edit; } QColor QtDasherScreen::getColor(int Color, const Opts::ColorSchemes ColorScheme) const { switch (ColorScheme) { case Dasher::Opts::Nodes1: switch (Color) { case 0: return QColor (180, 245, 180); |