--- Begin Message ---
Package: rosegarden4
Version: 0.9.9-1
Severity: wishlist
Apart from a minor gotcha in the configure script (causing -fPIC not to
be detected, consequently failing the build, at least on amd64), this
patch has been kindly provided by Helio Chissini de Castro. This will
allow rosegarden4 0.9.9 to build cleanly with gcc 3.4. C.f.
http://www.mail-archive.com/rosegarden-devel@lists.sourceforge.net/msg05147.html
diff -Naur rosegarden4-0.9.9/admin/acinclude.m4.in rosegarden4-0.9.9.fixed/admin/acinclude.m4.in
--- rosegarden4-0.9.9/admin/acinclude.m4.in 2004-10-02 10:22:16.056648444 +0200
+++ rosegarden4-0.9.9.fixed/admin/acinclude.m4.in 2004-10-01 21:55:08.000000000 +0200
@@ -2671,7 +2671,7 @@
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
if test "$kde_use_debug_code" != "no"; then
if test "$CXX" = "KCC"; then
- CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+ CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
else
if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 $CXXFLAGS"
@@ -2713,7 +2713,7 @@
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion $CXXFLAGS"
;;
esac
- CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+ CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
@@ -3124,7 +3124,7 @@
AC_CACHE_VAL(kde_cv_func_stpcpy,
[
kde_safe_cxxflags=$CXXFLAGS
- CXXFLAGS="-Wmissing-prototypes -Werror"
+ CXXFLAGS="-Werror"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([
diff -Naur rosegarden4-0.9.9/gui/audiocommands.h rosegarden4-0.9.9.fixed/gui/audiocommands.h
--- rosegarden4-0.9.9/gui/audiocommands.h 2004-05-04 10:16:51.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/audiocommands.h 2004-10-02 10:20:16.638262091 +0200
@@ -32,7 +32,7 @@
{
class Segment;
class AudioFile;
-};
+}
/**
*
diff -Naur rosegarden4-0.9.9/gui/editviewbase.cpp rosegarden4-0.9.9.fixed/gui/editviewbase.cpp
--- rosegarden4-0.9.9/gui/editviewbase.cpp 2004-07-26 01:01:00.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/editviewbase.cpp 2004-10-02 10:20:16.628263902 +0200
@@ -212,17 +212,20 @@
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/matrix.xpm"));
+ 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");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/notation.xpm"));
+
+ 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");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/eventlist.xpm"));
+
+ 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");
diff -Naur rosegarden4-0.9.9/gui/eventview.cpp rosegarden4-0.9.9.fixed/gui/eventview.cpp
--- rosegarden4-0.9.9/gui/eventview.cpp 2004-07-22 18:11:57.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/eventview.cpp 2004-10-02 10:20:16.629263721 +0200
@@ -1200,19 +1200,21 @@
SLOT(slotEditInsert()), actionCollection(),
"insert");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-delete.xpm"));
+ QCanvasPixmap pixmap( pixmapDir + "/toolbar/event-delete.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("&Delete Event"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit.xpm"));
+ pixmap.load( pixmapDir + "/toolbar/event-edit.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("&Edit Event"), icon, Key_E, this,
SLOT(slotEditEvent()), actionCollection(),
"edit_simple");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit-advanced.xpm"));
+
+ 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,23 +1238,26 @@
KRadioAction *action;
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
+ 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);
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
+
+ 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);
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
+
+ pixmap.load( pixmapDir + "/toolbar/time-raw.xpm" );
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
diff -Naur rosegarden4-0.9.9/gui/markereditor.cpp rosegarden4-0.9.9.fixed/gui/markereditor.cpp
--- rosegarden4-0.9.9/gui/markereditor.cpp 2004-05-27 18:16:18.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/markereditor.cpp 2004-10-02 10:20:16.630263540 +0200
@@ -404,15 +404,17 @@
KRadioAction *action;
- QIconSet icon(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
+ 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);
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
+
+ pixmap.load( pixmapDir + "/toolbar/time-real.xpm" );
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
@@ -420,7 +422,8 @@
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
diff -Naur rosegarden4-0.9.9/gui/matrixtool.cpp rosegarden4-0.9.9.fixed/gui/matrixtool.cpp
--- rosegarden4-0.9.9/gui/matrixtool.cpp 2004-07-28 14:22:58.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/matrixtool.cpp 2004-10-02 10:20:16.630263540 +0200
@@ -164,7 +164,9 @@
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
+
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
+ QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
@@ -177,8 +179,9 @@
new KAction(i18n("Switch to Move Tool"), "move", 0, this,
SLOT(slotMoveSelected()), actionCollection(),
"move");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+
+ pixmap.load( pixmapDir + "/toolbar/resize.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
@@ -341,7 +344,8 @@
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
+ QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
@@ -355,7 +359,8 @@
SLOT(slotMoveSelected()), actionCollection(),
"move");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/resize.xpm");
+ icon = QIconSet();
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
@@ -419,7 +424,9 @@
"move");
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
+ QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
@@ -753,7 +760,8 @@
m_oldY(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
+ QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
@@ -767,7 +775,8 @@
SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+ pixmap.load( pixmapDir + "/toolbar/resize.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("Switch to Resize Tool"), icon, 0, this,
SLOT(slotResizeSelected()), actionCollection(),
"resize");
@@ -1056,7 +1065,9 @@
m_currentStaff(0)
{
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
+
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
+ QIconSet icon = QIconSet( pixmap );
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
SLOT(slotSelectSelected()), actionCollection(),
diff -Naur rosegarden4-0.9.9/gui/matrixview.cpp rosegarden4-0.9.9.fixed/gui/matrixview.cpp
--- rosegarden4-0.9.9/gui/matrixview.cpp 2004-07-28 16:58:21.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/matrixview.cpp 2004-10-02 10:20:16.631263359 +0200
@@ -523,7 +523,8 @@
actionCollection(), "move");
toolAction->setExclusiveGroup("tools");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
+ icon = QIconSet( pixmap );
toolAction = new KRadioAction(i18n("Resi&ze"), icon, Key_F5,
this, SLOT(slotResizeSelected()),
actionCollection(), "resize");
@@ -535,12 +536,14 @@
actionCollection(), "chord_mode"))->
setChecked(false);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/step_by_step.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/quantize.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/quantize.xpm");
+ icon = QIconSet( pixmap );
new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
diff -Naur rosegarden4-0.9.9/gui/notationview.cpp rosegarden4-0.9.9.fixed/gui/notationview.cpp
--- rosegarden4-0.9.9/gui/notationview.cpp 2004-07-29 18:42:48.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/notationview.cpp 2004-10-02 10:20:16.633262996 +0200
@@ -1455,21 +1455,24 @@
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/linear-layout.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/continuous-page-mode.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/multi-page-mode.xpm"));
+ 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");
diff -Naur rosegarden4-0.9.9/gui/rosegardenconfigurationpage.h rosegarden4-0.9.9.fixed/gui/rosegardenconfigurationpage.h
--- rosegarden4-0.9.9/gui/rosegardenconfigurationpage.h 2004-07-23 15:52:31.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/rosegardenconfigurationpage.h 2004-10-02 10:20:16.639261910 +0200
@@ -214,7 +214,7 @@
*/
class NotationConfigurationPage : public TabbedConfigurationPage
{
- Q_OBJECT;
+ Q_OBJECT
public:
NotationConfigurationPage(KConfig *cfg,
@@ -269,7 +269,7 @@
*/
class MatrixConfigurationPage : public TabbedConfigurationPage
{
- Q_OBJECT;
+ Q_OBJECT
public:
MatrixConfigurationPage(KConfig *cfg,
diff -Naur rosegarden4-0.9.9/gui/rosegardengui.cpp rosegarden4-0.9.9.fixed/gui/rosegardengui.cpp
--- rosegarden4-0.9.9/gui/rosegardengui.cpp 2004-07-29 11:00:36.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/rosegardengui.cpp 2004-10-02 10:20:16.636262453 +0200
@@ -589,7 +589,9 @@
// Create the select icon
//
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/select.xpm"));
+
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
+ QIconSet icon = QIconSet( pixmap );
// TODO : add some shortcuts here
action = new KRadioAction(i18n("&Select"), icon, Key_F1,
@@ -613,19 +615,22 @@
actionCollection(), "move");
action->setExclusiveGroup("segmenttools");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/resize.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/split.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/join.xpm"));
+ pixmap.load( pixmapDir + "/toolbar/join.xpm" );
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Join"), icon, 0/* Key_F7 */,
this, SLOT(slotJoinSelected()),
actionCollection(), "join");
@@ -681,17 +686,20 @@
SLOT(slotEdit()), actionCollection(),
"edit_default");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/matrix.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/notation.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/eventlist.xpm"));
+ 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,7 +709,8 @@
this, SLOT(slotRelabelSegments()),
actionCollection(), "relabel_segment");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/quantize.xpm"));
+ pixmap.load( pixmapDir + "/toolbar/quantize.xpm" );
+ icon = QIconSet( pixmap );
new KAction(i18n("&Quantize..."), icon, Key_Equal, this,
SLOT(slotQuantizeSelection()), actionCollection(),
"quantize_selection");
@@ -760,7 +769,8 @@
SLOT(slotTempoToSegmentLength()), actionCollection(),
"set_tempo_to_segment_length");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/manage-audio-segments.xpm"));
+ 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,7 +780,9 @@
//
// Tracks menu
//
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/add_tracks.xpm"));
+
+ 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,17 +791,20 @@
this, SLOT(slotAddTracks()),
actionCollection(), "add_tracks");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/delete_track.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/move_track_down.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/move_track_up.xpm"));
+ 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,12 +819,14 @@
this, SLOT(slotTrackUp()),
actionCollection(), "select_previous_track");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/mute-all.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/un-mute-all.xpm"));
+ 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,22 +838,26 @@
//
// Studio menu
//
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/mixer.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/mixer.xpm");
+ icon = QIconSet( pixmap );
new KAction(i18n("&Audio Mixer"), icon, 0, this,
SLOT(slotOpenAudioMixer()),
actionCollection(), "audio_mixer");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/midimixer.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/midimixer.xpm");
+ icon = QIconSet( pixmap );
new KAction(i18n("Midi Mi&xer"), icon, 0, this,
SLOT(slotOpenMidiMixer()),
actionCollection(), "midi_mixer");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/manage-midi-devices.xpm"));
+ 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");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/manage-synth-plugins.xpm"));
+ 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,7 +866,8 @@
SLOT(slotModifyMIDIFilters()),
actionCollection(), "modify_midi_filters");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "toolbar/time-musical.xpm"));
+ pixmap.load(pixmapDir + "toolbar/time-musical.xpm");
+ icon = QIconSet( pixmap );
new KAction(i18n("Manage &Metronome"), 0, this,
SLOT(slotManageMetronome()),
actionCollection(), "manage_metronome");
@@ -876,56 +898,66 @@
// 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"));
+
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-stop.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-ffwd.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-rewind.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-record.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-record.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-rewind-end.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-ffwd-end.xpm"));
+ 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);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/transport-tracking.xpm"));
+ 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);
diff -Naur rosegarden4-0.9.9/gui/studiocontrol.cpp rosegarden4-0.9.9.fixed/gui/studiocontrol.cpp
--- rosegarden4-0.9.9/gui/studiocontrol.cpp 2004-07-26 16:34:55.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/studiocontrol.cpp 2004-10-02 10:20:16.639261910 +0200
@@ -550,5 +550,5 @@
}
-};
+}
diff -Naur rosegarden4-0.9.9/gui/tempoview.cpp rosegarden4-0.9.9.fixed/gui/tempoview.cpp
--- rosegarden4-0.9.9/gui/tempoview.cpp 2004-06-02 13:56:59.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/tempoview.cpp 2004-10-02 10:20:16.637262272 +0200
@@ -599,25 +599,30 @@
EditViewBase::setupActions("tempoview.rc", false);
QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- QIconSet icon(QPixmap(pixmapDir + "/toolbar/event-insert-tempo.xpm"));
+
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.xpm");
+ QIconSet icon( pixmap );
new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, this,
SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-insert-timesig.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.xpm");
+ icon = QIconSet( pixmap );
new KAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, this,
SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig");
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-delete.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/event-delete.xpm");
+ icon = QIconSet( pixmap );
new KAction(i18n("&Delete"), icon, Key_Delete, this,
SLOT(slotEditDelete()), actionCollection(),
"delete");
-
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/event-edit.xpm"));
+
+ pixmap.load(pixmapDir + "/toolbar/event-edit.xpm");
+ icon = QIconSet( pixmap );
new KAction(i18n("&Edit Item"), icon, Key_E, this,
SLOT(slotEdit()), actionCollection(),
@@ -636,7 +641,8 @@
KRadioAction *action;
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-musical.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
@@ -644,7 +650,8 @@
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-real.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
@@ -652,7 +659,8 @@
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
diff -Naur rosegarden4-0.9.9/gui/triggermanager.cpp rosegarden4-0.9.9.fixed/gui/triggermanager.cpp
--- rosegarden4-0.9.9/gui/triggermanager.cpp 2004-07-28 16:58:22.000000000 +0200
+++ rosegarden4-0.9.9.fixed/gui/triggermanager.cpp 2004-10-02 10:20:16.638262091 +0200
@@ -454,7 +454,8 @@
KRadioAction *action;
- QIconSet icon(QCanvasPixmap(pixmapDir + "/toolbar/time-musical.xpm"));
+ QCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.xpm");
+ QIconSet icon( pixmap );
action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
SLOT(slotMusicalTime()),
@@ -462,7 +463,8 @@
action->setExclusiveGroup("timeMode");
if (timeMode == 0) action->setChecked(true);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-real.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-real.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
SLOT(slotRealTime()),
@@ -470,7 +472,8 @@
action->setExclusiveGroup("timeMode");
if (timeMode == 1) action->setChecked(true);
- icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/time-raw.xpm"));
+ pixmap.load(pixmapDir + "/toolbar/time-raw.xpm");
+ icon = QIconSet( pixmap );
action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
SLOT(slotRawTime()),
diff -Naur rosegarden4-0.9.9/sound/LADSPAPluginInstance.h rosegarden4-0.9.9.fixed/sound/LADSPAPluginInstance.h
--- rosegarden4-0.9.9/sound/LADSPAPluginInstance.h 2004-07-26 16:34:58.000000000 +0200
+++ rosegarden4-0.9.9.fixed/sound/LADSPAPluginInstance.h 2004-10-02 10:20:16.638262091 +0200
@@ -126,7 +126,7 @@
bool m_bypassed;
};
-};
+}
#endif // HAVE_LADSPA
--
Kåre Hviid ukh@id.cbs.dk +45 3815 3075
Sys Admin Institut for Datalingvistik, Handelshøjskolen i København
--- End Message ---