Hi.. Here's attached two patches to solve compilation problems against new gcc 3.4.1 C++ parser and Qt 3.3.1 ( without introducing 3.2 incompatibilities )
Major change is QPixmap inline constructions that move to a private constructor instead the QString based one, so i moved to no inline constructions. Btw, theres a lot of calls to same process QPixmap, which could be improved if a single static funtions fro loading pixmaps was added. Of course this is relevant in the case of new parser. []'s -- Helio Chissini de Castro KDE Project South America Primary Contact Curitiba - Brasil
*** rosegarden-4-0.9.9/gui/editviewbase.cpp.orig 2004-08-04 10:55:34.791014890 -0300
--- rosegarden-4-0.9.9/gui/editviewbase.cpp 2004-08-04 11:21:00.899670565 -0300
***************
*** 212,228 ****
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/matrix.xpm"));
new KAction(i18n("Open in Matri&x Editor"), icon, 0, this,
SLOT(slotOpenInMatrix()), actionCollection(),
"open_in_matrix");
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/notation.xpm"));
new KAction(i18n("Open in &Notation Editor"), icon, 0, this,
SLOT(slotOpenInNotation()), actionCollection(),
"open_in_notation");
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/eventlist.xpm"));
new KAction(i18n("Open in &Event List Editor"), icon, 0, this,
SLOT(slotOpenInEventList()), actionCollection(),
"open_in_event_list");
--- 212,231 ----
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QCanvasPixmap pixmap( pixmapDir + "/toolbar/matrix.xpm" );
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Open in Matri&x Editor"), icon, 0, this,
SLOT(slotOpenInMatrix()), actionCollection(),
"open_in_matrix");
!
! pixmap.load( pixmapDir + "/toolbar/notation.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("Open in &Notation Editor"), icon, 0, this,
SLOT(slotOpenInNotation()), actionCollection(),
"open_in_notation");
!
! pixmap.load( pixmapDir + "/toolbar/eventlist.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("Open in &Event List Editor"), icon, 0, this,
SLOT(slotOpenInEventList()), actionCollection(),
"open_in_event_list");
*** rosegarden-4-0.9.9/gui/eventview.cpp.orig 2004-08-04 11:22:50.220441556 -0300
--- rosegarden-4-0.9.9/gui/eventview.cpp 2004-08-04 11:27:02.561823470 -0300
***************
*** 1200,1218 ****
SLOT(slotEditInsert()), actionCollection(),
"insert");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-delete.xpm"));
new KAction(i18n("&Delete Event"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit.xpm"));
new KAction(i18n("&Edit Event"), icon, Key_E, this,
SLOT(slotEditEvent()), actionCollection(),
"edit_simple");
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit-advanced.xpm"));
new KAction(i18n("&Advanced Event Editor"), icon, Key_A, this,
SLOT(slotEditEventAdvanced()), actionCollection(),
--- 1200,1220 ----
SLOT(slotEditInsert()), actionCollection(),
"insert");
! QCanvasPixmap pixmap( pixmapDir + "/toolbar/event-delete.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("&Delete Event"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
+ pixmap.load( pixmapDir + "/toolbar/event-edit.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("&Edit Event"), icon, Key_E, this,
SLOT(slotEditEvent()), actionCollection(),
"edit_simple");
!
! pixmap.load( pixmapDir + "/toolbar/event-edit-advanced.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("&Advanced Event Editor"), icon, Key_A, this,
SLOT(slotEditEventAdvanced()), actionCollection(),
***************
*** 1236,1258 ****
KRadioAction *action;
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
--- 1238,1263 ----
KRadioAction *action;
! pixmap.load( pixmapDir + "/toolbar/time-musical.xpm" );
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
!
! pixmap.load( pixmapDir + "/toolbar/time-real.xpm" );
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
!
! pixmap.load( pixmapDir + "/toolbar/time-raw.xpm" );
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
*** rosegarden-4-0.9.9/gui/markereditor.cpp.orig 2004-08-04 11:33:25.707413409 -0300
--- rosegarden-4-0.9.9/gui/markereditor.cpp 2004-08-04 11:35:16.512870038 -0300
***************
*** 404,418 ****
KRadioAction *action;
! QIconSet icon(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
--- 404,420 ----
KRadioAction *action;
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.xpm");
! QIconSet icon( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
!
! pixmap.load( pixmapDir + "/toolbar/time-real.xpm" );
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
***************
*** 420,426 ****
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
--- 422,429 ----
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
*** rosegarden-4-0.9.9/gui/matrixtool.cpp.orig 2004-08-04 11:36:35.041184836 -0300
--- rosegarden-4-0.9.9/gui/matrixtool.cpp 2004-08-04 11:41:55.031196100 -0300
***************
*** 164,170 ****
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
--- 164,172 ----
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
***************
*** 177,184 ****
new KAction(i18n("Switch to Move Tool"), "move", 0, this,
SLOT(slotMoveSelected()), actionCollection(),
"move");
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
--- 179,187 ----
new KAction(i18n("Switch to Move Tool"), "move", 0, this,
SLOT(slotMoveSelected()), actionCollection(),
"move");
!
! pixmap.load( pixmapDir + "/toolbar/resize.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
***************
*** 341,347 ****
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
--- 344,351 ----
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
***************
*** 355,361 ****
SLOT(slotMoveSelected()), actionCollection(),
"move");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
--- 359,366 ----
SLOT(slotMoveSelected()), actionCollection(),
"move");
! pixmap.load(pixmapDir + "/toolbar/resize.xpm");
! icon = QIconSet();
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
***************
*** 419,425 ****
"move");
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
--- 424,432 ----
"move");
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
***************
*** 753,759 ****
m_oldY(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
--- 760,767 ----
m_oldY(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
***************
*** 767,773 ****
SLOT(slotEraseSelected()), actionCollection(),
"erase");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
--- 775,782 ----
SLOT(slotEraseSelected()), actionCollection(),
"erase");
! pixmap.load( pixmapDir + "/toolbar/resize.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
***************
*** 1056,1062 ****
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
--- 1065,1073 ----
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
! QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
*** rosegarden-4-0.9.9/gui/matrixview.cpp.orig 2004-08-04 11:43:14.854236158 -0300
--- rosegarden-4-0.9.9/gui/matrixview.cpp 2004-08-04 11:46:18.027317764 -0300
***************
*** 523,529 ****
actionCollection(), "move");
toolAction->setExclusiveGroup("tools");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
toolAction = new KRadioAction(i18n("Resi&ze"), icon, Key_F5,
this, SLOT(slotResizeSelected()),
actionCollection(), "resize");
--- 523,530 ----
actionCollection(), "move");
toolAction->setExclusiveGroup("tools");
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
! icon = QIconSet( pixmap );
toolAction = new KRadioAction(i18n("Resi&ze"), icon, Key_F5,
this, SLOT(slotResizeSelected()),
actionCollection(), "resize");
***************
*** 535,546 ****
actionCollection(), "chord_mode"))->
setChecked(false);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/step_by_step.xpm"));
new KToggleAction(i18n("Ste&p Recording"), icon, 0, this,
SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/quantize.xpm"));
new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
--- 536,549 ----
actionCollection(), "chord_mode"))->
setChecked(false);
! pixmap.load( pixmapDir + "/toolbar/step_by_step.xpm" );
! icon = QIconSet( pixmap );
new KToggleAction(i18n("Ste&p Recording"), icon, 0, this,
SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step");
! pixmap.load(pixmapDir + "/toolbar/quantize.xpm");
! icon = QIconSet( pixmap );
new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
*** rosegarden-4-0.9.9/gui/notationview.cpp.orig 2004-08-04 11:51:37.652529620 -0300
--- rosegarden-4-0.9.9/gui/notationview.cpp 2004-08-04 11:53:46.632107078 -0300
***************
*** 1455,1475 ****
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/linear-layout.xpm"));
KRadioAction *linearModeAction = new KRadioAction
(i18n("&Linear Layout"), icon, 0, this, SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
linearModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 0) linearModeAction->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/continuous-page-mode.xpm"));
KRadioAction *continuousPageModeAction = new KRadioAction
(i18n("&Continuous Page Layout"), icon, 0, this, SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
continuousPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 1) continuousPageModeAction->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/multi-page-mode.xpm"));
KRadioAction *multiPageModeAction = new KRadioAction
(i18n("&Multiple Page Layout"), icon, 0, this, SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
--- 1455,1478 ----
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
! icon = QIconSet( pixmap );
KRadioAction *linearModeAction = new KRadioAction
(i18n("&Linear Layout"), icon, 0, this, SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
linearModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 0) linearModeAction->setChecked(true);
! pixmap.load( pixmapDir + "/toolbar/continuous-page-mode.xpm" );
! icon = QIconSet( pixmap );
KRadioAction *continuousPageModeAction = new KRadioAction
(i18n("&Continuous Page Layout"), icon, 0, this, SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
continuousPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 1) continuousPageModeAction->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
! icon = QIconSet();
KRadioAction *multiPageModeAction = new KRadioAction
(i18n("&Multiple Page Layout"), icon, 0, this, SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
*** rosegarden-4-0.9.9/gui/rosegardengui.cpp.orig 2004-08-04 11:56:20.736497919 -0300
--- rosegarden-4-0.9.9/gui/rosegardengui.cpp 2004-08-04 12:08:44.290236167 -0300
***************
*** 589,595 ****
// Create the select icon
//
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
// TODO : add some shortcuts here
action = new KRadioAction(i18n("&Select"), icon, Key_F1,
--- 589,597 ----
// Create the select icon
//
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
! QIconSet icon = QIconSet( pixmap );
// TODO : add some shortcuts here
action = new KRadioAction(i18n("&Select"), icon, Key_F1,
***************
*** 613,631 ****
actionCollection(), "move");
action->setExclusiveGroup("segmenttools");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
action = new KRadioAction(i18n("&Resize"), icon, Key_F5,
this, SLOT(slotResizeSelected()),
actionCollection(), "resize");
action->setExclusiveGroup("segmenttools");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/split.xpm"));
action = new KRadioAction(i18n("&Split"), icon, Key_F6,
this, SLOT(slotSplitSelected()),
actionCollection(), "split");
action->setExclusiveGroup("segmenttools");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/join.xpm"));
action = new KRadioAction(i18n("&Join"), icon, 0/* Key_F7 */,
this, SLOT(slotJoinSelected()),
actionCollection(), "join");
--- 615,636 ----
actionCollection(), "move");
action->setExclusiveGroup("segmenttools");
! pixmap.load(pixmapDir + "/toolbar/resize.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Resize"), icon, Key_F5,
this, SLOT(slotResizeSelected()),
actionCollection(), "resize");
action->setExclusiveGroup("segmenttools");
! pixmap.load(pixmapDir + "/toolbar/split.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Split"), icon, Key_F6,
this, SLOT(slotSplitSelected()),
actionCollection(), "split");
action->setExclusiveGroup("segmenttools");
! pixmap.load( pixmapDir + "/toolbar/join.xpm" );
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Join"), icon, 0/* Key_F7 */,
this, SLOT(slotJoinSelected()),
actionCollection(), "join");
***************
*** 681,697 ****
SLOT(slotEdit()), actionCollection(),
"edit_default");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/matrix.xpm"));
new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, this,
SLOT(slotEditInMatrix()), actionCollection(),
"edit_matrix");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/notation.xpm"));
new KAction(i18n("Open in &Notation Editor"), icon, Key_N, this,
SLOT(slotEditAsNotation()), actionCollection(),
"edit_notation");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/eventlist.xpm"));
new KAction(i18n("Open in &Event List Editor"), icon, Key_E, this,
SLOT(slotEditInEventList()), actionCollection(),
"edit_event_list");
--- 686,705 ----
SLOT(slotEdit()), actionCollection(),
"edit_default");
! pixmap.load(pixmapDir + "/toolbar/matrix.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, this,
SLOT(slotEditInMatrix()), actionCollection(),
"edit_matrix");
! pixmap.load(pixmapDir + "/toolbar/notation.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Open in &Notation Editor"), icon, Key_N, this,
SLOT(slotEditAsNotation()), actionCollection(),
"edit_notation");
! pixmap.load(pixmapDir + "/toolbar/eventlist.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Open in &Event List Editor"), icon, Key_E, this,
SLOT(slotEditInEventList()), actionCollection(),
"edit_event_list");
***************
*** 701,707 ****
this, SLOT(slotRelabelSegments()),
actionCollection(), "relabel_segment");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/quantize.xpm"));
new KAction(i18n("&Quantize..."), icon, Key_Equal, this,
SLOT(slotQuantizeSelection()), actionCollection(),
"quantize_selection");
--- 709,716 ----
this, SLOT(slotRelabelSegments()),
actionCollection(), "relabel_segment");
! pixmap.load( pixmapDir + "/toolbar/quantize.xpm" );
! icon = QIconSet( pixmap );
new KAction(i18n("&Quantize..."), icon, Key_Equal, this,
SLOT(slotQuantizeSelection()), actionCollection(),
"quantize_selection");
***************
*** 760,766 ****
SLOT(slotTempoToSegmentLength()), actionCollection(),
"set_tempo_to_segment_length");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/manage-audio-segments.xpm"));
new KAction(i18n("Manage A&udio Segments"), icon,
Key_U + CTRL,
this, SLOT(slotAudioManager()),
--- 769,776 ----
SLOT(slotTempoToSegmentLength()), actionCollection(),
"set_tempo_to_segment_length");
! pixmap.load(pixmapDir + "/toolbar/manage-audio-segments.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Manage A&udio Segments"), icon,
Key_U + CTRL,
this, SLOT(slotAudioManager()),
***************
*** 770,776 ****
//
// Tracks menu
//
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/add_tracks.xpm"));
new KAction(i18n("Add &Track"), icon, CTRL + Key_T,
this, SLOT(slotAddTrack()),
actionCollection(), "add_track");
--- 780,788 ----
//
// Tracks menu
//
!
! pixmap.load(pixmapDir + "/toolbar/add_tracks.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Add &Track"), icon, CTRL + Key_T,
this, SLOT(slotAddTrack()),
actionCollection(), "add_track");
***************
*** 779,795 ****
this, SLOT(slotAddTracks()),
actionCollection(), "add_tracks");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/delete_track.xpm"));
new KAction(i18n("D&elete Track"), icon, CTRL + Key_D,
this, SLOT(slotDeleteTrack()),
actionCollection(), "delete_track");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/move_track_down.xpm"));
new KAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down,
this, SLOT(slotMoveTrackDown()),
actionCollection(), "move_track_down");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/move_track_up.xpm"));
new KAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up,
this, SLOT(slotMoveTrackUp()),
actionCollection(), "move_track_up");
--- 791,810 ----
this, SLOT(slotAddTracks()),
actionCollection(), "add_tracks");
! pixmap.load(pixmapDir + "/toolbar/delete_track.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("D&elete Track"), icon, CTRL + Key_D,
this, SLOT(slotDeleteTrack()),
actionCollection(), "delete_track");
! pixmap.load(pixmapDir + "/toolbar/move_track_down.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down,
this, SLOT(slotMoveTrackDown()),
actionCollection(), "move_track_down");
! pixmap.load(pixmapDir + "/toolbar/move_track_up.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up,
this, SLOT(slotMoveTrackUp()),
actionCollection(), "move_track_up");
***************
*** 804,815 ****
this, SLOT(slotTrackUp()),
actionCollection(), "select_previous_track");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/mute-all.xpm"));
new KAction(i18n("&Mute all Tracks"), icon, 0,
this, SLOT(slotMuteAllTracks()),
actionCollection(), "mute_all_tracks");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/un-mute-all.xpm"));
new KAction(i18n("&Unmute all Tracks"), icon, 0,
this, SLOT(slotUnmuteAllTracks()),
actionCollection(), "unmute_all_tracks");
--- 819,832 ----
this, SLOT(slotTrackUp()),
actionCollection(), "select_previous_track");
! pixmap.load(pixmapDir + "/toolbar/mute-all.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("&Mute all Tracks"), icon, 0,
this, SLOT(slotMuteAllTracks()),
actionCollection(), "mute_all_tracks");
! pixmap.load(pixmapDir + "/toolbar/un-mute-all.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("&Unmute all Tracks"), icon, 0,
this, SLOT(slotUnmuteAllTracks()),
actionCollection(), "unmute_all_tracks");
***************
*** 821,842 ****
//
// Studio menu
//
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/mixer.xpm"));
new KAction(i18n("&Audio Mixer"), icon, 0, this,
SLOT(slotOpenAudioMixer()),
actionCollection(), "audio_mixer");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/midimixer.xpm"));
new KAction(i18n("Midi Mi&xer"), icon, 0, this,
SLOT(slotOpenMidiMixer()),
actionCollection(), "midi_mixer");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/manage-midi-devices.xpm"));
new KAction(i18n("Manage MIDI &Devices"), icon, 0, this,
SLOT(slotManageMIDIDevices()),
actionCollection(), "manage_devices");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/manage-synth-plugins.xpm"));
new KAction(i18n("Manage S&ynth Plugins"), icon, 0, this,
SLOT(slotManageSynths()),
actionCollection(), "manage_synths");
--- 838,863 ----
//
// Studio menu
//
! pixmap.load(pixmapDir + "/toolbar/mixer.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("&Audio Mixer"), icon, 0, this,
SLOT(slotOpenAudioMixer()),
actionCollection(), "audio_mixer");
! pixmap.load(pixmapDir + "/toolbar/midimixer.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Midi Mi&xer"), icon, 0, this,
SLOT(slotOpenMidiMixer()),
actionCollection(), "midi_mixer");
! pixmap.load(pixmapDir + "toolbar/manage-midi-devices.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Manage MIDI &Devices"), icon, 0, this,
SLOT(slotManageMIDIDevices()),
actionCollection(), "manage_devices");
! pixmap.load(pixmapDir + "toolbar/manage-synth-plugins.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Manage S&ynth Plugins"), icon, 0, this,
SLOT(slotManageSynths()),
actionCollection(), "manage_synths");
***************
*** 845,851 ****
SLOT(slotModifyMIDIFilters()),
actionCollection(), "modify_midi_filters");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/time-musical.xpm"));
new KAction(i18n("Manage &Metronome"), 0, this,
SLOT(slotManageMetronome()),
actionCollection(), "manage_metronome");
--- 866,873 ----
SLOT(slotModifyMIDIFilters()),
actionCollection(), "modify_midi_filters");
! pixmap.load(pixmapDir + "toolbar/time-musical.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("Manage &Metronome"), 0, this,
SLOT(slotManageMetronome()),
actionCollection(), "manage_metronome");
***************
*** 876,931 ****
// use 1 (End) and 3 (Page Down) for Rwd and Ffwd and
// 0 (insert) and keypad Enter for Play and Stop
//
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, this,
SLOT(slotPlay()), actionCollection(),
"play");
m_playTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-stop.xpm"));
m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, this,
SLOT(slotStop()), actionCollection(),
"stop");
m_stopTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-ffwd.xpm"));
m_ffwdTransport = new KAction(i18n("&Fast Forward"), icon, Key_PageDown,
this,
SLOT(slotFastforward()), actionCollection(),
"fast_forward");
m_ffwdTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-rewind.xpm"));
m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, this,
SLOT(slotRewind()), actionCollection(),
"rewind");
m_rewindTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-record.xpm"));
m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, this,
SLOT(slotToggleRecord()), actionCollection(),
"recordtoggle");
m_recordTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-record.xpm"));
m_recordTransport = new KAction(i18n("&Record"), icon, 0, this,
SLOT(slotRecord()), actionCollection(),
"record");
m_recordTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-rewind-end.xpm"));
m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, this,
SLOT(slotRewindToBeginning()), actionCollection(),
"rewindtobeginning");
m_rewindEndTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-ffwd-end.xpm"));
m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, this,
SLOT(slotFastForwardToEnd()), actionCollection(),
"fastforwardtoend");
m_ffwdEndTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-tracking.xpm"));
(new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(true);
--- 898,963 ----
// use 1 (End) and 3 (Page Down) for Rwd and Ffwd and
// 0 (insert) and keypad Enter for Play and Stop
//
!
! pixmap.load(pixmapDir + "/toolbar/transport-play.xpm");
! icon = QIconSet( pixmap );
m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, this,
SLOT(slotPlay()), actionCollection(),
"play");
m_playTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-stop.xpm");
! icon = QIconSet( pixmap );
m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, this,
SLOT(slotStop()), actionCollection(),
"stop");
m_stopTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-ffwd.xpm");
! icon = QIconSet( pixmap );
m_ffwdTransport = new KAction(i18n("&Fast Forward"), icon, Key_PageDown,
this,
SLOT(slotFastforward()), actionCollection(),
"fast_forward");
m_ffwdTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-rewind.xpm");
! icon = QIconSet( pixmap );
m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, this,
SLOT(slotRewind()), actionCollection(),
"rewind");
m_rewindTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-record.xpm");
! icon = QIconSet( pixmap );
m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, this,
SLOT(slotToggleRecord()), actionCollection(),
"recordtoggle");
m_recordTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-record.xpm");
! icon = QIconSet( pixmap );
m_recordTransport = new KAction(i18n("&Record"), icon, 0, this,
SLOT(slotRecord()), actionCollection(),
"record");
m_recordTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.xpm");
! icon = QIconSet( pixmap );
m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, this,
SLOT(slotRewindToBeginning()), actionCollection(),
"rewindtobeginning");
m_rewindEndTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.xpm");
! icon = QIconSet( pixmap );
m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, this,
SLOT(slotFastForwardToEnd()), actionCollection(),
"fastforwardtoend");
m_ffwdEndTransport->setGroup(RosegardenTransportDialog::ConfigGroup);
! pixmap.load(pixmapDir + "/toolbar/transport-tracking.xpm");
! icon = QIconSet( pixmap );
(new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(true);
*** rosegarden-4-0.9.9/gui/tempoview.cpp.orig 2004-08-04 12:15:38.816651525 -0300
--- rosegarden-4-0.9.9/gui/tempoview.cpp 2004-08-04 12:18:45.699892507 -0300
***************
*** 599,623 ****
EditViewBase::setupActions("tempoview.rc", false);
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
! QIconSet icon(QPixmap(pixmapDir + "/toolbar/event-insert-tempo.xpm"));
new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, this,
SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-insert-timesig.xpm"));
new KAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, this,
SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig");
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-delete.xpm"));
new KAction(i18n("&Delete"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
!
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit.xpm"));
new KAction(i18n("&Edit Item"), icon, Key_E, this,
SLOT(slotEdit()), actionCollection(),
--- 599,628 ----
EditViewBase::setupActions("tempoview.rc", false);
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.xpm");
! QIconSet icon( pixmap );
new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, this,
SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo");
! pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.xpm");
! icon = QIconSet( pixmap );
new KAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, this,
SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig");
! pixmap.load(pixmapDir + "/toolbar/event-delete.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("&Delete"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
!
! pixmap.load(pixmapDir + "/toolbar/event-edit.xpm");
! icon = QIconSet( pixmap );
new KAction(i18n("&Edit Item"), icon, Key_E, this,
SLOT(slotEdit()), actionCollection(),
***************
*** 636,642 ****
KRadioAction *action;
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
--- 641,648 ----
KRadioAction *action;
! pixmap.load(pixmapDir + "/toolbar/time-musical.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
***************
*** 644,650 ****
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
--- 650,657 ----
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/time-real.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
***************
*** 652,658 ****
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
--- 659,666 ----
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
*** rosegarden-4-0.9.9/gui/triggermanager.cpp.orig 2004-08-04 12:19:49.110073486 -0300
--- rosegarden-4-0.9.9/gui/triggermanager.cpp 2004-08-04 12:20:48.039235739 -0300
***************
*** 454,460 ****
KRadioAction *action;
! QIconSet icon(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
--- 454,461 ----
KRadioAction *action;
! QCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.xpm");
! QIconSet icon( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
***************
*** 462,468 ****
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
--- 463,470 ----
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/time-real.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
***************
*** 470,476 ****
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
--- 472,479 ----
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
! pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
! icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
*** rosegarden-4-0.9.9/sound/LADSPAPluginInstance.h.orig 2004-08-04 10:45:56.671377289 -0300
--- rosegarden-4-0.9.9/sound/LADSPAPluginInstance.h 2004-08-04 10:46:16.249053488 -0300
***************
*** 126,132 ****
bool m_bypassed;
};
! };
#endif // HAVE_LADSPA
--- 126,132 ----
bool m_bypassed;
};
! }
#endif // HAVE_LADSPA
*** rosegarden-4-0.9.9/gui/rosegardenconfigurationpage.h.orig 2004-08-04 10:50:14.610472509 -0300
--- rosegarden-4-0.9.9/gui/rosegardenconfigurationpage.h 2004-08-04 10:51:18.690355945 -0300
***************
*** 269,275 ****
*/
class MatrixConfigurationPage : public TabbedConfigurationPage
{
! Q_OBJECT;
public:
MatrixConfigurationPage(KConfig *cfg,
--- 269,275 ----
*/
class MatrixConfigurationPage : public TabbedConfigurationPage
{
! Q_OBJECT
public:
MatrixConfigurationPage(KConfig *cfg,
*** rosegarden-4-0.9.9/gui/audiocommands.h.orig 2004-08-04 10:52:18.213250287 -0300
--- rosegarden-4-0.9.9/gui/audiocommands.h 2004-08-04 10:52:27.826134364 -0300
***************
*** 32,38 ****
{
class Segment;
class AudioFile;
! };
/**
*
--- 32,38 ----
{
class Segment;
class AudioFile;
! }
/**
*
*** rosegarden-4-0.9.9/gui/rosegardenconfigurationpage.h.orig 2004-08-04 11:49:58.438487918 -0300
--- rosegarden-4-0.9.9/gui/rosegardenconfigurationpage.h 2004-08-04 11:50:05.750934280 -0300
***************
*** 214,220 ****
*/
class NotationConfigurationPage : public TabbedConfigurationPage
{
! Q_OBJECT;
public:
NotationConfigurationPage(KConfig *cfg,
--- 214,220 ----
*/
class NotationConfigurationPage : public TabbedConfigurationPage
{
! Q_OBJECT
public:
NotationConfigurationPage(KConfig *cfg,
*** rosegarden-4-0.9.9/gui/studiocontrol.cpp.orig 2004-08-04 12:14:27.233276540 -0300
--- rosegarden-4-0.9.9/gui/studiocontrol.cpp 2004-08-04 12:14:38.973713376 -0300
***************
*** 550,554 ****
}
! };
--- 550,554 ----
}
! }
pgp5KDM8jCOjj.pgp
Description: PGP signature
