summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-14 15:43:08 (UTC)
committer zecke <zecke>2004-08-14 15:43:08 (UTC)
commit7657b6986a600ec1b3626c83e8f19036bf69e493 (patch) (side-by-side diff)
treed8196d985a24663e9777dcc811f54b0eaf1abc9b
parent3df06db9e6fd268c7d234be05b01a2303dc0f7ba (diff)
downloadopie-7657b6986a600ec1b3626c83e8f19036bf69e493.zip
opie-7657b6986a600ec1b3626c83e8f19036bf69e493.tar.gz
opie-7657b6986a600ec1b3626c83e8f19036bf69e493.tar.bz2
Do not delete the parent in dtor, when the parent called you for
destruction
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherPlugin.cc2
-rw-r--r--inputmethods/dasher/QtDasherScreen.cc2
2 files changed, 1 insertions, 3 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
@@ -26,25 +26,25 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
interface->ChangeMaxBitRate(2.5);
d->show();
utf8_codec = new QUtf8Codec;
}
QSize QtDasherPlugin::sizeHint() const
{
return QSize(240,100);
}
QtDasherPlugin::~QtDasherPlugin()
{
- delete d;
+ delete interface;
}
void QtDasherPlugin::resetState()
{
flushcount=0;
interface->Start();
interface->Redraw();
}
void QtDasherPlugin::unflush()
{
if (flushcount==0)
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
@@ -70,26 +70,24 @@ long QtDasherScreen::get_time()
s_now = tv.tv_sec-1054487600;
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);
case 1: return QColor (160, 200, 160);
case 2: return QColor (0, 255, 255);
default: abort ();
}