[Gnash-commit] /srv/bzr/gnash/trunk r10577: Drop jump / step from kde3 as well.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10577
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-02-12 14:21:17 +0100
message:
  Drop jump / step from kde3 as well.
modified:
  gui/kde.cpp
  gui/kdesup.h
  gui/klash3.moc.in

=== modified file 'gui/kde.cpp'
--- a/gui/kde.cpp       2008-11-14 22:39:17 +0000
+++ b/gui/kde.cpp       2009-02-12 13:21:17 +0000
@@ -379,38 +379,6 @@
     _godfather->stop();
 }
 
-/// \brief step forward 1 frame
-void
-qwidget::menuitem_step_forward_callback()
-{
-//    GNASH_REPORT_FUNCTION;
-    _godfather->menu_step_forward();
-}
-
-/// \brief step backward 1 frame
-void
-qwidget::menuitem_step_backward_callback()
-{
-//    GNASH_REPORT_FUNCTION;
-    _godfather->menu_step_backward();
-}
-
-/// \brief jump forward 10 frames
-void
-qwidget::menuitem_jump_forward_callback()
-{
-//    GNASH_REPORT_FUNCTION;
-    _godfather->menu_jump_forward();
-}
-
-/// \brief jump backward 10 frames
-void
-qwidget::menuitem_jump_backward_callback()
-{
-//    GNASH_REPORT_FUNCTION;
-    _godfather->menu_jump_backward();
-}
-
 //
 // Event handlers
 //

=== modified file 'gui/kdesup.h'
--- a/gui/kdesup.h      2008-03-29 10:13:54 +0000
+++ b/gui/kdesup.h      2009-02-12 13:21:17 +0000
@@ -15,8 +15,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __KDESUP_H__
-#define __KDESUP_H__
+#ifndef GNASH_KDESUP_H
+#define GNASH_KDESUP_H
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -74,10 +74,6 @@
     void menuitem_play_callback();
     void menuitem_pause_callback();
     void menuitem_stop_callback();
-    void menuitem_step_forward_callback();
-    void menuitem_step_backward_callback();
-    void menuitem_jump_forward_callback();
-    void menuitem_jump_backward_callback();
 private:
     QPopupMenu    _qmenu;
     KdeGui*       _godfather;

=== modified file 'gui/klash3.moc.in'
--- a/gui/klash3.moc.in 2008-12-29 16:28:57 +0000
+++ b/gui/klash3.moc.in 2009-02-12 13:21:17 +0000
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** gnash::qwidget meta object code from reading C++ file 'kdesup.h'
 **
-** Created: Mon Dec 29 17:25:54 2008
+** Created: Thu Feb 12 14:20:33 2009
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -58,25 +58,17 @@
     static const QUMethod slot_3 = {"menuitem_play_callback", 0, 0 };
     static const QUMethod slot_4 = {"menuitem_pause_callback", 0, 0 };
     static const QUMethod slot_5 = {"menuitem_stop_callback", 0, 0 };
-    static const QUMethod slot_6 = {"menuitem_step_forward_callback", 0, 0 };
-    static const QUMethod slot_7 = {"menuitem_step_backward_callback", 0, 0 };
-    static const QUMethod slot_8 = {"menuitem_jump_forward_callback", 0, 0 };
-    static const QUMethod slot_9 = {"menuitem_jump_backward_callback", 0, 0 };
     static const QMetaData slot_tbl[] = {
        { "menuitem_restart_callback()", &slot_0, QMetaData::Public },
        { "menuitem_refresh_callback()", &slot_1, QMetaData::Public },
        { "menuitem_quit_callback()", &slot_2, QMetaData::Public },
        { "menuitem_play_callback()", &slot_3, QMetaData::Public },
        { "menuitem_pause_callback()", &slot_4, QMetaData::Public },
-       { "menuitem_stop_callback()", &slot_5, QMetaData::Public },
-       { "menuitem_step_forward_callback()", &slot_6, QMetaData::Public },
-       { "menuitem_step_backward_callback()", &slot_7, QMetaData::Public },
-       { "menuitem_jump_forward_callback()", &slot_8, QMetaData::Public },
-       { "menuitem_jump_backward_callback()", &slot_9, QMetaData::Public }
+       { "menuitem_stop_callback()", &slot_5, QMetaData::Public }
     };
     metaObj = QMetaObject::new_metaobject(
        "gnash::qwidget", parentObject,
-       slot_tbl, 10,
+       slot_tbl, 6,
        0, 0,
 #ifndef QT_NO_PROPERTIES
        0, 0,
@@ -103,10 +95,6 @@
     case 3: menuitem_play_callback(); break;
     case 4: menuitem_pause_callback(); break;
     case 5: menuitem_stop_callback(); break;
-    case 6: menuitem_step_forward_callback(); break;
-    case 7: menuitem_step_backward_callback(); break;
-    case 8: menuitem_jump_forward_callback(); break;
-    case 9: menuitem_jump_backward_callback(); break;
     default:
        return WIDGETCLASS::qt_invoke( _id, _o );
     }