[patch] gcc 3.4 fix

rosegarden-4.0.9.9-gcc342.patch (text/plain), 13.46 KB, created by Alex Chapman on 2004-11-10 07:59:16 UTC

*** 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, 
	      SLOT(slotSelectSelected()), actionCollection(),
--- 1065,1072 ----
        m_currentStaff(0)
  {
      QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
!     QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
!     icon = QIconSet(pixmap);

      new KAction(i18n("Switch to Select Tool"), icon, 
	      SLOT(slotSelectSelected()), actionCollection(),