summaryrefslogtreecommitdiff
path: root/core/launcher/taskbar.cpp
authorharlekin <harlekin>2002-05-22 16:43:38 (UTC)
committer harlekin <harlekin>2002-05-22 16:43:38 (UTC)
commit9b5016f30bb619b702664aad1e12cd4de4bc5b5b (patch) (unidiff)
treef053e522c1e33067bb7b60880a35c049753e2823 /core/launcher/taskbar.cpp
parentd7c7e0a272996ef3ae386e939d25737d3060e427 (diff)
downloadopie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.zip
opie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.tar.gz
opie-9b5016f30bb619b702664aad1e12cd4de4bc5b5b.tar.bz2
followup for custom-ipaq to make it compile again
Diffstat (limited to 'core/launcher/taskbar.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/taskbar.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 54777c6..b69d165 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -13,13 +13,13 @@
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19*********************************************************************/
20 20
21#include "startmenu.h" 21#include "startmenu.h"
22#include "inputmethods.h" 22#include "inputmethods.h"
23#include "mrulist.h" 23#include "mrulist.h"
24#include "systray.h" 24#include "systray.h"
25#include "calibrate.h" 25#include "calibrate.h"
@@ -29,15 +29,15 @@
29#include "taskbar.h" 29#include "taskbar.h"
30#include "desktop.h" 30#include "desktop.h"
31 31
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
33#include <qpe/qcopenvelope_qws.h> 33#include <qpe/qcopenvelope_qws.h>
34#include <qpe/global.h> 34#include <qpe/global.h>
35#ifdef QT_QWS_CUSTOM 35//#ifdef QT_QWS_CUSTOM
36#include <qpe/custom.h> 36//#include <qpe/custom.h>
37#endif 37//#endif
38#if defined(QT_QWS_IPAQ) 38#if defined(QT_QWS_IPAQ)
39#include "qpe/custom-ipaq.h" 39#include "qpe/custom-ipaq.h"
40#endif 40#endif
41 41
42 42
43#include <qlabel.h> 43#include <qlabel.h>
@@ -148,20 +148,20 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
148 sm = new StartMenu( this ); 148 sm = new StartMenu( this );
149 149
150 inputMethods = new InputMethods( this ); 150 inputMethods = new InputMethods( this );
151 connect( inputMethods, SIGNAL(inputToggled(bool)), 151 connect( inputMethods, SIGNAL(inputToggled(bool)),
152 this, SLOT(calcMaxWindowRect()) ); 152 this, SLOT(calcMaxWindowRect()) );
153 //new QuickLauncher( this ); 153 //new QuickLauncher( this );
154 154
155 stack = new QWidgetStack( this ); 155 stack = new QWidgetStack( this );
156 stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); 156 stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
157 label = new QLabel(stack); 157 label = new QLabel(stack);
158 158
159 mru = new MRUList( stack ); 159 mru = new MRUList( stack );
160 stack->raiseWidget( mru ); 160 stack->raiseWidget( mru );
161 161
162 waitIcon = new Wait( this ); 162 waitIcon = new Wait( this );
163 (void) new AppIcons( this ); 163 (void) new AppIcons( this );
164 164
165 sysTray = new SysTray( this ); 165 sysTray = new SysTray( this );
166 166
167 // ## make customizable in some way? 167 // ## make customizable in some way?
@@ -269,19 +269,19 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
269 inputMethods->loadInputMethods(); 269 inputMethods->loadInputMethods();
270 } else if ( msg == "reloadApplets()" ) { 270 } else if ( msg == "reloadApplets()" ) {
271 sysTray->loadApplets(); 271 sysTray->loadApplets();
272 } else if ( msg == "soundAlarm()" ) { 272 } else if ( msg == "soundAlarm()" ) {
273 Desktop::soundAlarm(); 273 Desktop::soundAlarm();
274 } 274 }
275#ifdef CUSTOM_LEDS 275#ifdef CUSTOM_LEDS
276 else if ( msg == "setLed(int,bool)" ) { 276 else if ( msg == "setLed(int,bool)" ) {
277 int led, status; 277 int led, status;
278 stream >> led >> status; 278 stream >> led >> status;
279 CUSTOM_LEDS( led, status ); 279 CUSTOM_LEDS( led, status );
280 } 280 }
281#endif 281#endif
282} 282}
283 283
284QWidget *TaskBar::calibrate(bool) 284QWidget *TaskBar::calibrate(bool)
285{ 285{
286#ifdef Q_WS_QWS 286#ifdef Q_WS_QWS
287 Calibrate *c = new Calibrate; 287 Calibrate *c = new Calibrate;