[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-433-g4c801f1

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  4c801f1f78391bfab7f6abd7931c98087c24b143 (commit)
       via  e6eea4302f9d6c14e82a09b5c2df2ab0d32cb8ea (commit)
       via  aae84f2783704e08bf913b34f90c5ac662b246e2 (commit)
      from  c2913487c8053ab649eae6a069e43b97b050712d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4c801f1f78391bfab7f6abd7931c98087c24b143


commit 4c801f1f78391bfab7f6abd7931c98087c24b143
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 30 09:14:41 2011 +0200

    Line length.

diff --git a/libcore/vm/ActionExec.cpp b/libcore/vm/ActionExec.cpp
index 86b3861..726f0db 100644
--- a/libcore/vm/ActionExec.cpp
+++ b/libcore/vm/ActionExec.cpp
@@ -289,13 +289,16 @@ ActionExec::operator()()
             );
 #endif
 
-
             // Do some housecleaning on branch back
             if (next_pc <= pc) {
                 // Check for script limits hit. 
                 // See: http://www.gnashdev.org/wiki/index.php/ScriptLimits
                 if (clock.elapsed() > maxTime) {
-                    boost::format fmt = boost::format(_("Time exceeded (%4% 
secs) while executing code in %1% between pc %2% and %3%")) % 
code.getMovieDefinition().get_url() % next_pc % pc % (maxTime/1000);
+                    boost::format fmt = 
+                        boost::format(_("Time exceeded (%4% secs) while "
+                            "executing code in %1% between pc %2% and %3%")) %
+                            code.getMovieDefinition().get_url() % next_pc %
+                            pc % (maxTime/1000);
                     throw ActionLimitException(fmt.str());
                 }
                 // TODO: Run garbage collector ? If stack isn't too big ?
@@ -303,7 +306,6 @@ ActionExec::operator()()
 
             // Control flow actions will change the PC (next_pc)
             pc = next_pc;
-
         }
     }
     catch (const ActionLimitException&) {

http://git.savannah.gnu.org/cgit//commit/?id=e6eea4302f9d6c14e82a09b5c2df2ab0d32cb8ea


commit e6eea4302f9d6c14e82a09b5c2df2ab0d32cb8ea
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 30 09:08:51 2011 +0200

    Indentation.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 06fcb4f..a669c92 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -2121,25 +2121,23 @@ GtkGui::yesno(const std::string& question)
 {
     bool ret = true;
 
-    GtkWidget *dialog;
-
-    dialog = gtk_message_dialog_new(
+    GtkWidget *dialog = gtk_message_dialog_new(
         GTK_WINDOW(_window),
         GTK_DIALOG_MODAL,
         GTK_MESSAGE_QUESTION,
         GTK_BUTTONS_YES_NO,
         question.c_str());
 
-    switch(gtk_dialog_run(GTK_DIALOG(dialog)))
+    switch (gtk_dialog_run(GTK_DIALOG(dialog)))
     {
-      case GTK_RESPONSE_YES:
-        ret = true;
-        break;
-      case GTK_RESPONSE_NO:
-        ret = false;
-        break;
-      default:
-        break;
+        case GTK_RESPONSE_YES:
+            ret = true;
+            break;
+        case GTK_RESPONSE_NO:
+            ret = false;
+            break;
+        default:
+            break;
     }
 
     gtk_widget_destroy(dialog);

http://git.savannah.gnu.org/cgit//commit/?id=aae84f2783704e08bf913b34f90c5ac662b246e2


commit aae84f2783704e08bf913b34f90c5ac662b246e2
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 30 09:08:38 2011 +0200

    Implement yesno for qt4.

diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 82965fe..94c0986 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -55,6 +55,7 @@
 #include <QClipboard>
 #include <QString>
 #include <QDesktopWidget>
+#include <QMessageBox>
 
 #include "Range2d.h"
 
@@ -155,7 +156,6 @@ Qt4Gui::init(int /*argc*/, char ** /*argv*/[])
     return true;
 }
 
-
 bool
 Qt4Gui::run()
 {
@@ -254,7 +254,6 @@ Qt4Gui::renderBuffer()
     }
 }
 
-
 void
 Qt4Gui::renderWidget(const QRect& updateRect)
 {
@@ -263,7 +262,6 @@ Qt4Gui::renderWidget(const QRect& updateRect)
     _glue->render(updateRect);
 }
 
-
 void
 Qt4Gui::setInvalidatedRegions(const InvalidatedRanges& ranges)
 {
@@ -288,7 +286,6 @@ Qt4Gui::setInvalidatedRegions(const InvalidatedRanges& 
ranges)
     }
 }
 
-
 void
 Qt4Gui::setTimeout(unsigned int timeout)
 {
@@ -297,14 +294,12 @@ Qt4Gui::setTimeout(unsigned int timeout)
     QTimer::singleShot(timeout, _drawingWidget, SLOT(quit()));
 }
 
-
 void
 Qt4Gui::setInterval(unsigned int interval)
 {
     _drawingWidget->startTimer(interval);
 }
 
-
 void
 Qt4Gui::setCursor(gnash_cursor_type newcursor)
 {
@@ -433,7 +428,6 @@ Qt4Gui::qtToGnashKey(QKeyEvent *event)
 
 }
 
-
 int
 Qt4Gui::qtToGnashModifier(const Qt::KeyboardModifiers modifiers)
 {
@@ -457,7 +451,6 @@ Qt4Gui::handleKeyEvent(QKeyEvent *event, bool down)
     notify_key_event(c, mod, down);
 }
 
-
 void
 Qt4Gui::resize(int width, int height)
 {
@@ -550,8 +543,6 @@ Qt4Gui::showProperties()
     propsDialog->activateWindow();
 }
 
-
-
 void
 Qt4Gui::showPreferences()
 {
@@ -563,6 +554,17 @@ Qt4Gui::showPreferences()
     prefsDialog->activateWindow();
 }
 
+bool
+Qt4Gui::yesno(const std::string& question)
+{
+    QMessageBox* dialog = new QMessageBox(_drawingWidget);
+    dialog->setText(QString::fromStdString(question));
+    dialog->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    dialog->setDefaultButton(QMessageBox::Yes);
+    const int ret = dialog->exec();
+    if (ret == QMessageBox::Yes) return true;
+    return false;
+}
 
 void
 Qt4Gui::quitUI()
@@ -570,7 +572,6 @@ Qt4Gui::quitUI()
     _application->quit();
 }
 
-
 void
 Qt4Gui::setupActions()
 {
diff --git a/gui/qt/Qt4Gui.h b/gui/qt/Qt4Gui.h
index e6fc8a3..33e104d 100644
--- a/gui/qt/Qt4Gui.h
+++ b/gui/qt/Qt4Gui.h
@@ -103,6 +103,7 @@ public:
     virtual void setClipboard(const std::string& copy);
     virtual std::pair<int, int> screenResolution() const;
     virtual double getScreenDPI() const;
+    virtual bool yesno(const std::string& question);
 
     void setInvalidatedRegions(const InvalidatedRanges& ranges);
     void resize(int width, int height);

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk.cpp           |   22 ++++++++++------------
 gui/qt/Qt4Gui.cpp         |   23 ++++++++++++-----------
 gui/qt/Qt4Gui.h           |    1 +
 libcore/vm/ActionExec.cpp |    8 +++++---
 4 files changed, 28 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
Gnash