| -rw-r--r-- | core/launcher/shutdownimpl.cpp | 5 | ||||
| -rw-r--r-- | core/launcher/taskbar.cpp | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp index a202b7b..cf4f926 100644 --- a/core/launcher/shutdownimpl.cpp +++ b/core/launcher/shutdownimpl.cpp @@ -114,11 +114,6 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl ) m_progress-> hide ( ); Global::hideInputMethod ( ); - -#ifdef QT_QWS_SHARP - - shutdown-> hide ( ); -#endif } void ShutdownImpl::buttonClicked ( int b ) diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 1e6b74e..b4b7df6 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp @@ -82,7 +82,7 @@ static Global::Command builtins[] = { #undef APP #endif -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SHARP) { "calibrate", TaskBar::calibrate, 1, 0 }, #endif #if !defined(QT_QWS_CASSIOPEIA) @@ -169,11 +169,7 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn sysTray = new SysTray( this ); // ## make customizable in some way? -#ifdef QT_QWS_SHARP lockState = new LockKeyState( this ); -#else - lockState = 0; -#endif #if defined(Q_WS_QWS) #if !defined(QT_NO_COP) |