| -rw-r--r-- | core/launcher/shutdownimpl.cpp | 5 | ||||
| -rw-r--r-- | core/launcher/taskbar.cpp | 8 |
2 files changed, 2 insertions, 11 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 @@ -115,9 +115,4 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl ) m_progress-> hide ( ); Global::hideInputMethod ( ); - -#ifdef QT_QWS_SHARP - - shutdown-> hide ( ); -#endif } 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 @@ -83,5 +83,5 @@ static Global::Command builtins[] = { #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 @@ -169,10 +169,6 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn sysTray = new SysTray( this ); - // ## make customizable in some way? -#ifdef QT_QWS_SHARP + // ## make customizable in some way? lockState = new LockKeyState( this ); -#else - lockState = 0; -#endif #if defined(Q_WS_QWS) |