author | cniehaus <cniehaus> | 2002-11-21 10:41:31 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-11-21 10:41:31 (UTC) |
commit | a098d09ef14e4b41a0120dd431ef4777fd420042 (patch) (unidiff) | |
tree | 0c428827e9f4b02c5c78d1037feb741d227edfc9 | |
parent | 354951c2751663e0a2f4fffe3fd3be71908df8b7 (diff) | |
download | opie-a098d09ef14e4b41a0120dd431ef4777fd420042.zip opie-a098d09ef14e4b41a0120dd431ef4777fd420042.tar.gz opie-a098d09ef14e4b41a0120dd431ef4777fd420042.tar.bz2 |
applied one of Simons patches.
-rw-r--r-- | core/launcher/startmenu.cpp | 2 | ||||
-rw-r--r-- | core/launcher/systray.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index 7373ea8..d9382d2 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -347,33 +347,33 @@ void StartMenu::loadApplets() | |||
347 | 347 | ||
348 | if ( sepId ) | 348 | if ( sepId ) |
349 | launchMenu-> removeItem ( sepId ); | 349 | launchMenu-> removeItem ( sepId ); |
350 | sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0; | 350 | sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0; |
351 | 351 | ||
352 | while (napplets--) { | 352 | while (napplets--) { |
353 | MenuApplet *applet = xapplets[napplets]; | 353 | MenuApplet *applet = xapplets[napplets]; |
354 | 354 | ||
355 | applet-> popup = applet-> iface-> popup ( this ); | 355 | applet-> popup = applet-> iface-> popup ( this ); |
356 | 356 | ||
357 | if ( applet-> popup ) | 357 | if ( applet-> popup ) |
358 | applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup ); | 358 | applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup ); |
359 | else | 359 | else |
360 | applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) ); | 360 | applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) ); |
361 | applets.insert ( applet-> id, new MenuApplet(*applet)); | 361 | applets.insert ( applet-> id, new MenuApplet(*applet)); |
362 | } | 362 | } |
363 | delete xapplets; | 363 | delete [] xapplets; |
364 | 364 | ||
365 | if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets | 365 | if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets |
366 | launchMenu-> removeItem ( sepId ); | 366 | launchMenu-> removeItem ( sepId ); |
367 | sepId = 0; | 367 | sepId = 0; |
368 | } | 368 | } |
369 | if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later | 369 | if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later |
370 | sepId = launchMenu-> insertSeparator ( ); | 370 | sepId = launchMenu-> insertSeparator ( ); |
371 | 371 | ||
372 | if ( !safety_tid ) | 372 | if ( !safety_tid ) |
373 | safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman) | 373 | safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman) |
374 | } | 374 | } |
375 | 375 | ||
376 | void StartMenu::timerEvent(QTimerEvent* e) | 376 | void StartMenu::timerEvent(QTimerEvent* e) |
377 | { | 377 | { |
378 | if ( e->timerId() == safety_tid ) { | 378 | if ( e->timerId() == safety_tid ) { |
379 | Config cfg( "StartMenu" ); | 379 | Config cfg( "StartMenu" ); |
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp index 4859e48..be55791 100644 --- a/core/launcher/systray.cpp +++ b/core/launcher/systray.cpp | |||
@@ -115,33 +115,33 @@ void SysTray::addApplets() | |||
115 | if ( trans->load( tfn )) | 115 | if ( trans->load( tfn )) |
116 | qApp->installTranslator( trans ); | 116 | qApp->installTranslator( trans ); |
117 | else | 117 | else |
118 | delete trans; | 118 | delete trans; |
119 | } else { | 119 | } else { |
120 | exclude += *it; | 120 | exclude += *it; |
121 | delete lib; | 121 | delete lib; |
122 | } | 122 | } |
123 | } | 123 | } |
124 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); | 124 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); |
125 | qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions); | 125 | qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions); |
126 | while (napplets--) { | 126 | while (napplets--) { |
127 | TaskbarApplet *applet = applets[napplets]; | 127 | TaskbarApplet *applet = applets[napplets]; |
128 | applet->applet = applet->iface->applet( this ); | 128 | applet->applet = applet->iface->applet( this ); |
129 | appletList.append(*applet); | 129 | appletList.append(*applet); |
130 | } | 130 | } |
131 | delete applets; | 131 | delete [] applets; |
132 | #else | 132 | #else |
133 | TaskbarApplet applet; | 133 | TaskbarApplet applet; |
134 | applet.iface = new ClockAppletImpl(); | 134 | applet.iface = new ClockAppletImpl(); |
135 | applet.applet = applet.iface->applet( this ); | 135 | applet.applet = applet.iface->applet( this ); |
136 | appletList.append( a ); | 136 | appletList.append( a ); |
137 | #endif | 137 | #endif |
138 | show(); | 138 | show(); |
139 | 139 | ||
140 | if ( !safety_tid ) | 140 | if ( !safety_tid ) |
141 | safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman) | 141 | safety_tid = startTimer(2000); // TT has 5000, but this is a PITA for a developer ;) (sandman) |
142 | } | 142 | } |
143 | 143 | ||
144 | void SysTray::timerEvent(QTimerEvent* e) | 144 | void SysTray::timerEvent(QTimerEvent* e) |
145 | { | 145 | { |
146 | if ( e->timerId() == safety_tid ) { | 146 | if ( e->timerId() == safety_tid ) { |
147 | Config cfg( "Taskbar" ); | 147 | Config cfg( "Taskbar" ); |