subtitlecomposer/subtitlecomposer-build-fixes.patch

   1 diff -ruN subtitlecomposer-0.5.3-old/src/config/appconfig.cpp subtitlecomposer-0.5.3/src/config/appconfig.cpp
   2 --- subtitlecomposer-0.5.3-old/src/config/appconfig.cpp 2009-02-25 23:46:09.000000000 +0100
   3 +++ subtitlecomposer-0.5.3/src/config/appconfig.cpp     2010-05-31 19:38:02.402837345 +0200
   4 @@ -120,7 +120,7 @@
   5         return m_groups.contains( name ) ? m_groups[name] : 0;
   6  }
   7
   8 -const AppConfigGroup* const AppConfig::group( const QString& name ) const
   9 +const AppConfigGroup* AppConfig::group( const QString& name ) const
  10  {
  11         return m_groups.contains( name ) ? m_groups[name] : 0;
  12  }
  13 diff -ruN subtitlecomposer-0.5.3-old/src/config/appconfiggroupwidget.cpp subtitlecomposer-0.5.3/src/config/appconfiggroupwidget.cpp
  14 --- subtitlecomposer-0.5.3-old/src/config/appconfiggroupwidget.cpp      2009-02-25 23:46:09.000000000 +0100
  15 +++ subtitlecomposer-0.5.3/src/config/appconfiggroupwidget.cpp  2010-05-31 19:35:25.526185415 +0200
  16 @@ -39,7 +39,7 @@
  17         delete m_config;
  18  }
  19
  20 -const AppConfigGroup* const AppConfigGroupWidget::config()
  21 +const AppConfigGroup* AppConfigGroupWidget::config()
  22  {
  23         return m_config;
  24  }
  25 diff -ruN subtitlecomposer-0.5.3-old/src/config/appconfiggroupwidget.h subtitlecomposer-0.5.3/src/config/appconfiggroupwidget.h
  26 --- subtitlecomposer-0.5.3-old/src/config/appconfiggroupwidget.h        2009-02-25 23:46:09.000000000 +0100
  27 +++ subtitlecomposer-0.5.3/src/config/appconfiggroupwidget.h    2010-05-31 19:35:20.630352728 +0200
  28 @@ -43,7 +43,7 @@
  29                         explicit AppConfigGroupWidget( AppConfigGroup* configGroup, QWidget* parent=0 );
  30                         virtual ~AppConfigGroupWidget();
  31
  32 -                       const AppConfigGroup* const config();
  33 +                       const AppConfigGroup* config();
  34
  35                 signals:
  36
  37 diff -ruN subtitlecomposer-0.5.3-old/src/config/appconfig.h subtitlecomposer-0.5.3/src/config/appconfig.h
  38 --- subtitlecomposer-0.5.3-old/src/config/appconfig.h   2009-02-25 23:46:09.000000000 +0100
  39 +++ subtitlecomposer-0.5.3/src/config/appconfig.h       2010-05-31 19:37:54.703670415 +0200
  40 @@ -58,7 +58,7 @@
  41                         void writeTo( KSharedConfig* config ) const;
  42
  43                         AppConfigGroup* group( const QString& name );
  44 -                       const AppConfigGroup* const group( const QString& name ) const;
  45 +                       const AppConfigGroup* group( const QString& name ) const;
  46
  47                         void setGroup( AppConfigGroup* group ); /// ownership is transferred to this object
  48                         AppConfigGroup* removeGroup( const QString& name ); /// ownership is transferred to the caller
  49 diff -ruN subtitlecomposer-0.5.3-old/src/core/sstring.cpp subtitlecomposer-0.5.3/src/core/sstring.cpp
  50 --- subtitlecomposer-0.5.3-old/src/core/sstring.cpp     2009-05-24 23:56:30.000000000 +0200
  51 +++ subtitlecomposer-0.5.3/src/core/sstring.cpp 2010-05-31 19:03:39.173876937 +0200
  52 @@ -1112,7 +1112,7 @@
  53         append( str );
  54  }
  55
  56 -SStringList::SStringList( const SStringList::SStringList& list ):
  57 +SStringList::SStringList( const SStringList& list ):
  58         QList<SString>( list )
  59  {
  60  }
  61 diff -ruN subtitlecomposer-0.5.3-old/src/core/subtitleactions.cpp subtitlecomposer-0.5.3/src/core/subtitleactions.cpp
  62 --- subtitlecomposer-0.5.3-old/src/core/subtitleactions.cpp     2009-02-25 23:46:11.000000000 +0100
  63 +++ subtitlecomposer-0.5.3/src/core/subtitleactions.cpp 2010-05-31 19:35:47.497016112 +0200
  64 @@ -136,7 +136,7 @@
  65
  66         SubtitleLine* line;
  67         int insertOffset = 0;
  68 -       int lineIndex;
  69 +       int lineIndex = 0;
  70         while ( ! m_lines.isEmpty() )
  71         {
  72                 line = m_lines.takeFirst();
  73 @@ -242,7 +242,7 @@
  74         emit m_subtitle.linesAboutToBeInserted( m_firstIndex, m_lastIndex );
  75
  76         int insertOffset = 0;
  77 -       int lineIndex;
  78 +       int lineIndex = 0;
  79         while ( ! m_lines.isEmpty() )
  80         {
  81                 SubtitleLine* line = m_lines.takeFirst();
  82 diff -ruN subtitlecomposer-0.5.3-old/src/core/subtitle.cpp subtitlecomposer-0.5.3/src/core/subtitle.cpp
  83 --- subtitlecomposer-0.5.3-old/src/core/subtitle.cpp    2009-05-24 10:08:53.000000000 +0200
  84 +++ subtitlecomposer-0.5.3/src/core/subtitle.cpp        2010-05-31 19:36:33.366179618 +0200
  85 @@ -216,7 +216,7 @@
  86         }
  87  }
  88
  89 -FormatData* const Subtitle::formatData() const
  90 +FormatData* Subtitle::formatData() const
  91  {
  92         return m_formatData;
  93  }
  94 @@ -1201,7 +1201,7 @@
  95                 return;
  96
  97         int splitIndex = -1; // the index of the first line to move (or copy) to dstSub
  98 -       bool splitsLine; // splitTime falls in within a line's time
  99 +       bool splitsLine = false; // splitTime falls in within a line's time
 100
 101         QList<SubtitleLine*> lines;
 102         for ( SubtitleIterator it( *this, Range::full() ); it.current(); ++it )
 103 diff -ruN subtitlecomposer-0.5.3-old/src/core/subtitle.h subtitlecomposer-0.5.3/src/core/subtitle.h
 104 --- subtitlecomposer-0.5.3-old/src/core/subtitle.h      2009-03-05 03:56:25.000000000 +0100
 105 +++ subtitlecomposer-0.5.3/src/core/subtitle.h  2010-05-31 19:36:28.420346163 +0200
 106 @@ -183,7 +183,7 @@
 107
 108                 private:
 109
 110 -                       FormatData* const formatData() const;
 111 +                       FormatData* formatData() const;
 112                         void setFormatData( const FormatData* formatData );
 113
 114                         void beginCompositeAction( const QString& title, bool immediateExecution=true, bool delaySignals=true );
 115 diff -ruN subtitlecomposer-0.5.3-old/src/core/subtitleline.cpp subtitlecomposer-0.5.3/src/core/subtitleline.cpp
 116 --- subtitlecomposer-0.5.3-old/src/core/subtitleline.cpp        2009-03-03 05:16:07.000000000 +0100
 117 +++ subtitlecomposer-0.5.3/src/core/subtitleline.cpp    2010-05-31 19:35:54.000000000 +0200
 118 @@ -289,7 +289,7 @@
 119  }
 120
 121
 122 -FormatData* const SubtitleLine::formatData() const
 123 +FormatData* SubtitleLine::formatData() const
 124  {
 125         return m_formatData;
 126  }
 127 diff -ruN subtitlecomposer-0.5.3-old/src/core/subtitleline.h subtitlecomposer-0.5.3/src/core/subtitleline.h
 128 --- subtitlecomposer-0.5.3-old/src/core/subtitleline.h  2009-03-03 05:16:07.000000000 +0100
 129 +++ subtitlecomposer-0.5.3/src/core/subtitleline.h      2010-05-31 19:36:02.793682498 +0200
 130 @@ -247,7 +247,7 @@
 131
 132                 private:
 133
 134 -                       FormatData* const formatData() const;
 135 +                       FormatData* formatData() const;
 136                         void setFormatData( const FormatData* formatData );
 137
 138                         void processAction( Action* action );
 139 diff -ruN subtitlecomposer-0.5.3-old/src/player/gstreamer/gstreamerbackend.cpp subtitlecomposer-0.5.3/src/player/gstreamer/gstreamerbackend.cpp
 140 --- subtitlecomposer-0.5.3-old/src/player/gstreamer/gstreamerbackend.cpp        2009-02-25 23:46:17.000000000 +0100
 141 +++ subtitlecomposer-0.5.3/src/player/gstreamer/gstreamerbackend.cpp    2010-05-31 19:37:23.237008638 +0200
 142 @@ -596,7 +596,7 @@
 143         params = g_object_class_list_properties( G_OBJECT_GET_CLASS( GST_ELEMENT( object ) ), &length );
 144         for ( guint index = 0; index < length; ++index )
 145         {
 146 -               gchar* strValue;
 147 +               gchar* strValue = 0;
 148
 149                 if ( params[index]->flags & G_PARAM_READABLE )
 150                 {
 151 diff -ruN subtitlecomposer-0.5.3-old/src/player/gstreamer/gstreamerbackend.h subtitlecomposer-0.5.3/src/player/gstreamer/gstreamerbackend.h
 152 --- subtitlecomposer-0.5.3-old/src/player/gstreamer/gstreamerbackend.h  2009-02-25 23:46:17.000000000 +0100
 153 +++ subtitlecomposer-0.5.3/src/player/gstreamer/gstreamerbackend.h      2010-05-31 19:34:31.977024143 +0200
 154 @@ -47,7 +47,7 @@
 155                         GStreamerBackend( Player* player );
 156                         virtual ~GStreamerBackend();
 157
 158 -                       const GStreamerConfig* const config() { return static_cast<const GStreamerConfig* const>( PlayerBackend::config() ); }
 159 +                       const GStreamerConfig* config() { return static_cast<const GStreamerConfig* const>( PlayerBackend::config() ); }
 160
 161                         virtual AppConfigGroupWidget* newAppConfigGroupWidget( QWidget* parent );
 162
 163 diff -ruN subtitlecomposer-0.5.3-old/src/player/mplayer/mplayerbackend.h subtitlecomposer-0.5.3/src/player/mplayer/mplayerbackend.h
 164 --- subtitlecomposer-0.5.3-old/src/player/mplayer/mplayerbackend.h      2009-02-25 23:46:17.000000000 +0100
 165 +++ subtitlecomposer-0.5.3/src/player/mplayer/mplayerbackend.h  2010-05-31 19:34:38.849523428 +0200
 166 @@ -45,7 +45,7 @@
 167                         MPlayerBackend( Player* player );
 168                         virtual ~MPlayerBackend();
 169
 170 -                       const MPlayerConfig* const config() { return static_cast<const MPlayerConfig* const>( PlayerBackend::config() ); }
 171 +                       const MPlayerConfig* config() { return static_cast<const MPlayerConfig* const>( PlayerBackend::config() ); }
 172
 173                         virtual AppConfigGroupWidget* newAppConfigGroupWidget( QWidget* parent );
 174
 175 diff -ruN subtitlecomposer-0.5.3-old/src/player/phonon/phononbackend.h subtitlecomposer-0.5.3/src/player/phonon/phononbackend.h
 176 --- subtitlecomposer-0.5.3-old/src/player/phonon/phononbackend.h        2009-02-25 23:46:16.000000000 +0100
 177 +++ subtitlecomposer-0.5.3/src/player/phonon/phononbackend.h    2010-05-31 19:34:44.607023515 +0200
 178 @@ -53,7 +53,7 @@
 179                         PhononBackend( Player* player );
 180                         virtual ~PhononBackend();
 181
 182 -                       const PhononConfig* const config() { return static_cast<const PhononConfig* const>( PlayerBackend::config() ); }
 183 +                       const PhononConfig* config() { return static_cast<const PhononConfig* const>( PlayerBackend::config() ); }
 184
 185                         virtual AppConfigGroupWidget* newAppConfigGroupWidget( QWidget* parent );
 186
 187 diff -ruN subtitlecomposer-0.5.3-old/src/player/playerbackend.h subtitlecomposer-0.5.3/src/player/playerbackend.h
 188 --- subtitlecomposer-0.5.3-old/src/player/playerbackend.h       2009-02-25 23:46:17.000000000 +0100
 189 +++ subtitlecomposer-0.5.3/src/player/playerbackend.h   2010-05-31 19:34:18.996192330 +0200
 190 @@ -48,7 +48,7 @@
 191                         PlayerBackend( Player* player, AppConfigGroup* config );
 192                         virtual ~PlayerBackend();
 193
 194 -                       const AppConfigGroup* const config() const { return m_config; }
 195 +                       const AppConfigGroup* config() const { return m_config; }
 196
 197                         /// If possible (i.e., configs are compatible), copies the config object into
 198                         /// the player backend config. Ownership of config object it's not transferred.
 199 diff -ruN subtitlecomposer-0.5.3-old/src/player/player.cpp subtitlecomposer-0.5.3/src/player/player.cpp
 200 --- subtitlecomposer-0.5.3-old/src/player/player.cpp    2009-02-25 23:46:17.000000000 +0100
 201 +++ subtitlecomposer-0.5.3/src/player/player.cpp        2010-05-31 19:38:38.306165999 +0200
 202 @@ -82,7 +82,7 @@
 203  {
 204  }
 205
 206 -Player* const Player::instance()
 207 +Player* Player::instance()
 208  {
 209         static Player player;
 210
 211 diff -ruN subtitlecomposer-0.5.3-old/src/player/player.h subtitlecomposer-0.5.3/src/player/player.h
 212 --- subtitlecomposer-0.5.3-old/src/player/player.h      2009-02-25 23:46:17.000000000 +0100
 213 +++ subtitlecomposer-0.5.3/src/player/player.h  2010-05-31 19:38:31.893666505 +0200
 214 @@ -53,7 +53,7 @@
 215                                 Ready // same as Stopped or Finished
 216                         } State;
 217
 218 -                       static Player* const instance();
 219 +                       static Player* instance();
 220
 221                         inline VideoWidget* videoWidget();
 222
 223 diff -ruN subtitlecomposer-0.5.3-old/src/player/xine/xinebackend.h subtitlecomposer-0.5.3/src/player/xine/xinebackend.h
 224 --- subtitlecomposer-0.5.3-old/src/player/xine/xinebackend.h    2009-02-25 23:46:16.000000000 +0100
 225 +++ subtitlecomposer-0.5.3/src/player/xine/xinebackend.h        2010-05-31 19:34:49.336188698 +0200
 226 @@ -51,7 +51,7 @@
 227                         XineBackend( Player* player );
 228                         virtual ~XineBackend();
 229
 230 -                       const XineConfig* const config() { return static_cast<const XineConfig* const>( PlayerBackend::config() ); }
 231 +                       const XineConfig* config() { return static_cast<const XineConfig* const>( PlayerBackend::config() ); }
 232
 233                         virtual AppConfigGroupWidget* newAppConfigGroupWidget( QWidget* parent );
 234
 235 diff -ruN subtitlecomposer-0.5.3-old/src/widgets/simplerichtextedit.cpp subtitlecomposer-0.5.3/src/widgets/simplerichtextedit.cpp
 236 --- subtitlecomposer-0.5.3-old/src/widgets/simplerichtextedit.cpp       2009-02-25 23:46:10.000000000 +0100
 237 +++ subtitlecomposer-0.5.3/src/widgets/simplerichtextedit.cpp   2010-05-31 19:42:18.002811365 +0200
 238 @@ -176,7 +176,7 @@
 239                 delete m_insertUnicodeControlCharMenu->parent();
 240  }
 241
 242 -KAction* const SimpleRichTextEdit::action( int action ) const
 243 +KAction* SimpleRichTextEdit::action( int action ) const
 244  {
 245         return action >= 0 && action < ActionCount ? m_actions[action] : 0;
 246  }
 247 diff -ruN subtitlecomposer-0.5.3-old/src/widgets/simplerichtextedit.h subtitlecomposer-0.5.3/src/widgets/simplerichtextedit.h
 248 --- subtitlecomposer-0.5.3-old/src/widgets/simplerichtextedit.h 2009-02-25 23:46:10.000000000 +0100
 249 +++ subtitlecomposer-0.5.3/src/widgets/simplerichtextedit.h     2010-05-31 19:42:11.763644715 +0200
 250 @@ -60,7 +60,7 @@
 251                 bool fontBold();
 252                 bool fontStrikeOut();
 253
 254 -               virtual KAction* const action( int action ) const;
 255 +               virtual KAction* action( int action ) const;
 256
 257                 virtual bool event( QEvent* event );
 258