[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-325-ga8d3d67 |
|
Date: |
Wed, 23 Mar 2011 11:25:50 +0000 |
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 a8d3d671380ce3a91d9cfe1c4bc753272bff3492 (commit)
from 60da047a208114bd6886fafcf6990a10a31dda03 (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=a8d3d671380ce3a91d9cfe1c4bc753272bff3492
commit a8d3d671380ce3a91d9cfe1c4bc753272bff3492
Author: Benjamin Wolsey <address@hidden>
Date: Wed Mar 23 11:45:05 2011 +0100
Rename kde4-gnash to qt4-gnash.
diff --git a/Makefile.am b/Makefile.am
index 60c65c8..f912c95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,15 +241,13 @@ endif
if BUILD_KDE3_GUI
@echo " KDE3_CFLAGS is $(KDE3_CFLAGS)"
@echo " KDE3_LIBS is $(KDE3_LIBS)"
+ @echo " QT3_CFLAGS is $(QT3_CFLAGS)"
+ @echo " QT3_LIBS is $(QT3_LIBS)"
endif
if BUILD_QT4_GUI
@echo " QT4_CFLAGS is $(QT4_CFLAGS)"
@echo " QT4_LIBS is $(QT4_LIBS)"
endif
-if BUILD_QT3_GUI
- @echo " QT3_CFLAGS is $(QT3_CFLAGS)"
- @echo " QT3_LIBS is $(QT3_LIBS)"
-endif
if BUILD_QT4_GUI
@echo " QT4_CFLAGS is $(QT4_CFLAGS)"
@echo " QT4_LIBS is $(QT4_LIBS)"
diff --git a/configure.ac b/configure.ac
index 97a53ea..8b4ec7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -551,7 +551,7 @@ build_sdl=no
build_aqua=no dnl Native MacOSX
build_dump=no
AC_ARG_ENABLE(gui,
- AC_HELP_STRING([--enable-gui=], [Enable support for the specified GUI
toolkits (default=gtk,kde4)]),
+ AC_HELP_STRING([--enable-gui=], [Enable support for the specified GUI
toolkits (default=gtk,qt4)]),
[if test -n ${enableval}; then
enableval=`echo ${enableval} | tr '\054' ' ' `
fi
@@ -564,7 +564,7 @@ AC_ARG_ENABLE(gui,
kde3|KDE3)
build_kde3=yes
;;
- kde4|KDE4)
+ qt4|QT4|kde4|KDE4)
build_qt4=yes
;;
qtopia3|QTOPIA3)
@@ -606,7 +606,7 @@ AC_ARG_ENABLE(gui,
build_sdl=yes
build_gtk=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|kde4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|qt4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)])
;;
esac
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1790,7 +1790,7 @@ dnl Add KPARTS 4.x support, if specified or KDE gui is
built
dnl --------------------------------------------------------
AC_ARG_ENABLE(kparts4,
- AC_HELP_STRING([--disable-kparts4], [Disble support for Konqueror 4.x plugin
(default: enabled if kde4 gui is)]),
+ AC_HELP_STRING([--disable-kparts4], [Disable support for Konqueror 4.x
plugin (default: enabled if Qt4 gui is)]),
[case "${enableval}" in
yes) build_kparts4=yes ;;
no) build_kparts4=no ;;
@@ -1802,11 +1802,11 @@ if test x"${build_kparts4}" != xno; then
fi
dnl -----------------------------------------------------------
-dnl Add NPAPI support, if specified or GTK or KDE4 gui is built
+dnl Add NPAPI support, if specified or GTK or Qt4 gui is built
dnl -----------------------------------------------------------
AC_ARG_ENABLE(npapi,
- AC_HELP_STRING([--disable-npapi], [Disable NPAPI plugin build (default:
enabled if gtk or kde4 gui is)]),
+ AC_HELP_STRING([--disable-npapi], [Disable NPAPI plugin build (default:
enabled if gtk or Qt4 gui is)]),
[case "${enableval}" in
yes) npapi=yes ;;
no) npapi=no ;;
@@ -2299,12 +2299,6 @@ fi
AM_CONDITIONAL(BUILD_QTOPIA3_GUI, [ test x$build_qtopia3 = xyes ])
AM_CONDITIONAL(BUILD_QTOPIA4_GUI, [ test x$build_qtopia4 = xyes ])
-dnl Drop these conditionals ?
-AM_CONDITIONAL(BUILD_QT3_GUI,
- [ test x"${build_kde3}" = xyes -o x"${build_qtopia3}" = xyes ])
-AM_CONDITIONAL(BUILD_QT4_GUI,
- [ test x"${build_qt4}" = xyes -o x"${build_qtopia4}" = xyes ])
-
AM_CONDITIONAL(BUILD_KDE3_GUI, [ test x$build_kde3 = xyes ])
AM_CONDITIONAL(BUILD_QT4_GUI, [ test x$build_qt4 = xyes ])
@@ -2717,7 +2711,7 @@ if test x$build_kde3 = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},kde3"
fi
if test x$build_qt4 = xyes; then
- SUPPORTED_GUIS="${SUPPORTED_GUIS},kde4"
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},qt4"
fi
if test x$build_gtk = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},gtk"
@@ -2896,7 +2890,7 @@ if test x"${build_kde3}" = xyes -o x"${build_qtopia3}" =
xyes; then
fi
fi
-dnl Dump QT4 options is the user specified a QTOPIA4 or KDE4 GUI
+dnl Dump QT4 options is the user specified a QTOPIA4 or Qt4 GUI
if test x"${build_qt4}" = xyes -o x"${build_qtopia4}" = xyes; then
if test x"${has_qt4}" = xyes; then
echo " QT4 flags are: ${QT4_CFLAGS}"
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 98884c4..1a51072 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# build gtk-gnash, kde-gnash, sdl-gnash, fltk-gnash, aqua-gnash, fb-gnash,
+# build gtk-gnash, qt4-gnash, sdl-gnash, fltk-gnash, aqua-gnash, fb-gnash,
# haiku-gnash and dump-gnash
#
@@ -50,9 +50,9 @@ pluginsdir = $(libdir)/gnash/plugins
BUILT_SOURCES =
EXTRA_DIST = gnash.in \
- kde/klash3.moc.in \
- kde/Kde4Gui.moc.in \
- kde/Kde4Glue.moc.in
+ qt/klash3.moc.in \
+ qt/Qt4Gui.moc.in \
+ qt/Qt4Glue.moc.in
noinst_HEADERS =
noinst_LTLIBRARIES =
@@ -196,20 +196,20 @@ endif
# Build the QTOPIA gui
if BUILD_QTOPIA3_GUI
-include $(srcdir)/kde/qtopia3.am
+include $(srcdir)/qt/qtopia3.am
endif
# Build the KDE3 gui
if BUILD_KDE3_GUI
BUILT_SOURCES += klash3.moc
-include $(srcdir)/kde/kde3.am
+include $(srcdir)/qt/kde3.am
endif
-# Build the KDE4 gui
+# Build the QT4 gui
if BUILD_QT4_GUI
-BUILT_SOURCES += Kde4Gui.moc
-BUILT_SOURCES += Kde4Glue.moc
-include $(srcdir)/kde/kde4.am
+BUILT_SOURCES += Qt4Gui.moc
+BUILT_SOURCES += Qt4Glue.moc
+include $(srcdir)/qt/qt4.am
endif
# Build the SDL gui
@@ -242,7 +242,7 @@ if BUILD_GTK_GUI
include $(srcdir)/gtk/gtk.am
endif
-CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc gnash
+CLEANFILES = klash3.moc Qt4Gui.moc Qt4Glue.moc gnash
bundle: Info.plist aqua-gnash
@echo " Building: $(bundle_name)"
@@ -254,12 +254,6 @@ bundle: Info.plist aqua-gnash
cp -f aqua-gnash $(bundle_name)/Contents/MacOS/Gnash
cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
-
-#noinst_PROGRAMS = guitest # klash flak
-#guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp
gtk.cpp
-# gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
-#guitest_LDADD = $(gnash_LDADD)
-
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
@@ -268,11 +262,3 @@ mudflap:
clean-hook:
-rm -f core.* $(CLEANFILES)
-# if DYNAMIC_GUI
-# install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
-# test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs)
"$(DESTDIR)$(plugindir)"
-# for i in $(plugins_LTLIBRARIES); do \
-# $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$i
"$(DESTDIR)$(plugindir)/$$i" ; \
-# done
-# endif
-
diff --git a/gui/Player.cpp b/gui/Player.cpp
index 918f8eb..2890b7f 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -800,8 +800,8 @@ Player::getGui()
return createKDEGui(_windowID, _scale, _doLoop, *_runResources);
#endif
-#ifdef GUI_KDE4
- return createKDE4Gui(_windowID, _scale, _doLoop, *_runResources);
+#ifdef GUI_QT4
+ return createQt4Gui(_windowID, _scale, _doLoop, *_runResources);
#endif
#ifdef GUI_SDL
diff --git a/gui/gnash.in b/gui/gnash.in
index 0ca37be..3b5a9fc 100755
--- a/gui/gnash.in
+++ b/gui/gnash.in
@@ -27,7 +27,7 @@
#!/bin/sh
-GUIS="gtk kde kde4 sdl fltk aqua fb haiku"
+GUIS="gtk kde qt4 sdl fltk aqua fb haiku"
THIS_DIR="`dirname $0`"
if test "$1" = "-G"; then
diff --git a/gui/gui.h b/gui/gui.h
index cf9552b..726dd84 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -612,7 +612,7 @@ private:
/// Named constructors
std::auto_ptr<Gui> createGTKGui(unsigned long xid, float scale, bool loop,
RunResources& r);
std::auto_ptr<Gui> createKDEGui(unsigned long xid, float scale, bool loop,
RunResources& r);
-std::auto_ptr<Gui> createKDE4Gui(unsigned long xid, float scale, bool loop,
RunResources& r);
+std::auto_ptr<Gui> createQt4Gui(unsigned long xid, float scale, bool loop,
RunResources& r);
std::auto_ptr<Gui> createSDLGui(unsigned long xid, float scale, bool loop,
RunResources& r);
std::auto_ptr<Gui> createFLTKGui(unsigned long xid, float scale, bool loop,
RunResources& r);
std::auto_ptr<Gui> createFBGui(unsigned long xid, float scale, bool loop,
RunResources& r);
diff --git a/gui/kde/GuiKde4.cpp b/gui/qt/GuiQt4.cpp
similarity index 69%
rename from gui/kde/GuiKde4.cpp
rename to gui/qt/GuiQt4.cpp
index df7d861..94bb23a 100644
--- a/gui/kde/GuiKde4.cpp
+++ b/gui/qt/GuiQt4.cpp
@@ -25,23 +25,23 @@
#include "gui.h"
#include "GnashException.h"
-#ifdef GUI_KDE4
-#include "Kde4Gui.h"
+#ifdef GUI_QT4
+#include "Qt4Gui.h"
#endif
namespace gnash {
-#ifdef GUI_KDE4
-std::auto_ptr<Gui> createKDE4Gui(unsigned long windowid, float scale, bool
do_loop, RunResources& r)
+#ifdef GUI_QT4
+std::auto_ptr<Gui> createQt4Gui(unsigned long windowid, float scale, bool
do_loop, RunResources& r)
{
- return std::auto_ptr<Gui>(new Kde4Gui(windowid, scale, do_loop, r));
+ return std::auto_ptr<Gui>(new Qt4Gui(windowid, scale, do_loop, r));
}
-#else // ! GUI_KDE4
-std::auto_ptr<Gui> createKDE4Gui(unsigned long , float, bool,
RunResourcesfloat , bool , unsigned int )
+#else
+std::auto_ptr<Gui> createQt4Gui(unsigned long , float, bool, RunResourcesfloat
, bool , unsigned int )
{
- throw GnashException("Support for KDE4 gui was not compiled in");
+ throw GnashException("Support for QT4 gui was not compiled in");
}
-#endif // ! GUI_KDE4
+#endif
} // namespace gnash
diff --git a/gui/kde/Kde4Glue.cpp b/gui/qt/Qt4Glue.cpp
similarity index 93%
rename from gui/kde/Kde4Glue.cpp
rename to gui/qt/Qt4Glue.cpp
index f0a1489..883390c 100644
--- a/gui/kde/Kde4Glue.cpp
+++ b/gui/qt/Qt4Glue.cpp
@@ -1,5 +1,5 @@
-// Kde4Glue.cpp: KDE4/Qt4 shared code to connect the various renderers to
-// the Kde4 gui.
+// Qt4Glue.cpp: KDE4/Qt4 shared code to connect the various renderers to
+// the Qt4 gui.
//
// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
// Foundation, Inc
@@ -23,9 +23,9 @@
#include "gnashconfig.h"
#endif
-#include "Kde4Glue.h"
-#include "Kde4Glue.moc"
-#include "Kde4Gui.h"
+#include "Qt4Glue.h"
+#include "Qt4Glue.moc"
+#include "Qt4Gui.h"
#include <QWidget>
#include <QPaintEvent>
#include <QMouseEvent>
@@ -34,7 +34,7 @@
namespace gnash {
/// DrawingWidget implementation
-DrawingWidget::DrawingWidget(Kde4Gui& gui)
+DrawingWidget::DrawingWidget(Qt4Gui& gui)
:
_gui(gui)
{
diff --git a/gui/kde/Kde4Glue.h b/gui/qt/Qt4Glue.h
similarity index 94%
rename from gui/kde/Kde4Glue.h
rename to gui/qt/Qt4Glue.h
index 6449c66..7b098e7 100644
--- a/gui/kde/Kde4Glue.h
+++ b/gui/qt/Qt4Glue.h
@@ -33,7 +33,7 @@ class QGLWidget;
namespace gnash {
class Renderer;
class DrawingWidget;
- class Kde4Gui;
+ class Qt4Gui;
}
namespace gnash {
@@ -43,7 +43,7 @@ class DrawingWidget : public QWidget
Q_OBJECT
public:
- DrawingWidget(Kde4Gui& gui);
+ DrawingWidget(Qt4Gui& gui);
~DrawingWidget() {}
#ifdef RENDERER_OPENGL
@@ -75,14 +75,14 @@ protected:
void contextMenuEvent(QContextMenuEvent* event);
private:
- Kde4Gui& _gui;
+ Qt4Gui& _gui;
};
-class Kde4Glue
+class Qt4Glue
{
public:
- Kde4Glue() : _drawing_area(NULL) {}
- virtual ~Kde4Glue() { }
+ Qt4Glue() : _drawing_area(NULL) {}
+ virtual ~Qt4Glue() { }
virtual bool init(int argc, char **argv[]) = 0;
virtual void prepDrawingArea(DrawingWidget *drawing_area) = 0;
diff --git a/gui/kde/Kde4Glue.moc.in b/gui/qt/Qt4Glue.moc.in
similarity index 89%
rename from gui/kde/Kde4Glue.moc.in
rename to gui/qt/Qt4Glue.moc.in
index ad6d02b..d0a8caa 100644
--- a/gui/kde/Kde4Glue.moc.in
+++ b/gui/qt/Qt4Glue.moc.in
@@ -1,17 +1,17 @@
/****************************************************************************
-** Meta object code from reading C++ file 'Kde4Glue.h'
+** Meta object code from reading C++ file 'Qt4Glue.h'
**
-** Created: Mon Mar 22 08:26:47 2010
-** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
+** Created: Wed Mar 23 11:02:13 2011
+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.3)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "Kde4Glue.h"
+#include "../../../trunk/gui/qt/Qt4Glue.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'Kde4Glue.h' doesn't include <QObject>."
+#error "The header file 'Qt4Glue.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 62
-#error "This file was generated using the moc from 4.6.2. It"
+#error "This file was generated using the moc from 4.6.3. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
diff --git a/gui/kde/Kde4GlueAgg.cpp b/gui/qt/Qt4GlueAgg.cpp
similarity index 85%
rename from gui/kde/Kde4GlueAgg.cpp
rename to gui/qt/Qt4GlueAgg.cpp
index 46617de..1d299f0 100644
--- a/gui/kde/Kde4GlueAgg.cpp
+++ b/gui/qt/Qt4GlueAgg.cpp
@@ -21,7 +21,7 @@
#include "gnashconfig.h"
#endif
-#include "Kde4GlueAgg.h"
+#include "Qt4GlueAgg.h"
#include "Renderer.h"
#include "Renderer_agg.h"
#include "GnashException.h"
@@ -32,7 +32,7 @@
namespace gnash
{
-Kde4AggGlue::Kde4AggGlue()
+Qt4AggGlue::Qt4AggGlue()
:
_width(0),
_height(0),
@@ -40,26 +40,26 @@ Kde4AggGlue::Kde4AggGlue()
{
}
-Kde4AggGlue::~Kde4AggGlue()
+Qt4AggGlue::~Qt4AggGlue()
{
}
bool
-Kde4AggGlue::init(int /* argc */, char *** /* argv */)
+Qt4AggGlue::init(int /* argc */, char *** /* argv */)
{
return true;
}
void
-Kde4AggGlue::prepDrawingArea(DrawingWidget *drawing_area)
+Qt4AggGlue::prepDrawingArea(DrawingWidget *drawing_area)
{
_drawing_area = drawing_area;
}
void
-Kde4AggGlue::initBuffer(int width, int height)
+Qt4AggGlue::initBuffer(int width, int height)
{
if (!_renderer) return;
@@ -88,7 +88,7 @@ Kde4AggGlue::initBuffer(int width, int height)
void
-Kde4AggGlue::render()
+Qt4AggGlue::render()
{
QRect r(0, 0, _width, _height);
render(r);
@@ -96,7 +96,7 @@ Kde4AggGlue::render()
void
-Kde4AggGlue::render(const QRect& updateRect)
+Qt4AggGlue::render(const QRect& updateRect)
{
QPainter p(_drawing_area);
@@ -106,7 +106,7 @@ Kde4AggGlue::render(const QRect& updateRect)
Renderer*
-Kde4AggGlue::createRenderHandler()
+Qt4AggGlue::createRenderHandler()
{
_renderer = create_Renderer_agg("BGRA32");
@@ -118,7 +118,7 @@ Kde4AggGlue::createRenderHandler()
}
void
-Kde4AggGlue::resize(int width, int height)
+Qt4AggGlue::resize(int width, int height)
{
initBuffer(width, height);
}
diff --git a/gui/kde/Kde4GlueAgg.h b/gui/qt/Qt4GlueAgg.h
similarity index 94%
rename from gui/kde/Kde4GlueAgg.h
rename to gui/qt/Qt4GlueAgg.h
index ab84714..94359ad 100644
--- a/gui/kde/Kde4GlueAgg.h
+++ b/gui/qt/Qt4GlueAgg.h
@@ -24,7 +24,7 @@
#include "gnashconfig.h"
#endif
-#include "Kde4Glue.h"
+#include "Qt4Glue.h"
#include <memory>
#include <QImage>
@@ -37,11 +37,11 @@ class QRect;
namespace gnash
{
-class Kde4AggGlue : public Kde4Glue
+class Qt4AggGlue : public Qt4Glue
{
public:
- Kde4AggGlue();
- ~Kde4AggGlue();
+ Qt4AggGlue();
+ ~Qt4AggGlue();
bool init(int argc, char **argv[]);
void prepDrawingArea(DrawingWidget *drawing_area);
diff --git a/gui/kde/Kde4GlueCairo.cpp b/gui/qt/Qt4GlueCairo.cpp
similarity index 87%
rename from gui/kde/Kde4GlueCairo.cpp
rename to gui/qt/Qt4GlueCairo.cpp
index 0ec9b23..49b6b4f 100644
--- a/gui/kde/Kde4GlueCairo.cpp
+++ b/gui/qt/Qt4GlueCairo.cpp
@@ -21,8 +21,8 @@
#include "gnashconfig.h"
#endif
-#include "Kde4Gui.h"
-#include "Kde4GlueCairo.h"
+#include "Qt4Gui.h"
+#include "Qt4GlueCairo.h"
#include "Renderer.h"
#include "Renderer_cairo.h"
#include <QWidget>
@@ -31,7 +31,7 @@
namespace gnash
{
-Kde4CairoGlue::Kde4CairoGlue()
+Qt4CairoGlue::Qt4CairoGlue()
:
_width(0),
_height(0),
@@ -42,20 +42,20 @@ Kde4CairoGlue::Kde4CairoGlue()
{
}
-Kde4CairoGlue::~Kde4CairoGlue()
+Qt4CairoGlue::~Qt4CairoGlue()
{
if (_cairo_surface)
cairo_surface_destroy(_cairo_surface);
}
bool
-Kde4CairoGlue::init(int /* argc */, char *** /* argv */)
+Qt4CairoGlue::init(int /* argc */, char *** /* argv */)
{
return true;
}
void
-Kde4CairoGlue::initBuffer(int width, int height)
+Qt4CairoGlue::initBuffer(int width, int height)
{
if (! _drawing_area)
return;
@@ -98,7 +98,7 @@ Kde4CairoGlue::initBuffer(int width, int height)
}
void
-Kde4CairoGlue::prepDrawingArea(DrawingWidget *drawing_area)
+Qt4CairoGlue::prepDrawingArea(DrawingWidget *drawing_area)
{
assert(drawing_area);
_drawing_area = drawing_area;
@@ -106,7 +106,7 @@ Kde4CairoGlue::prepDrawingArea(DrawingWidget *drawing_area)
void
-Kde4CairoGlue::render()
+Qt4CairoGlue::render()
{
QRect r(0, 0, _width, _height);
render(r);
@@ -114,7 +114,7 @@ Kde4CairoGlue::render()
void
-Kde4CairoGlue::render(const QRect& updateRect)
+Qt4CairoGlue::render(const QRect& updateRect)
{
assert(_drawing_area);
@@ -130,7 +130,7 @@ Kde4CairoGlue::render(const QRect& updateRect)
}
void
-Kde4CairoGlue::resize(int width, int height)
+Qt4CairoGlue::resize(int width, int height)
{
initBuffer(width, height);
}
@@ -138,7 +138,7 @@ Kde4CairoGlue::resize(int width, int height)
Renderer*
-Kde4CairoGlue::createRenderHandler()
+Qt4CairoGlue::createRenderHandler()
{
_renderer = renderer::cairo::create_handler();
diff --git a/gui/kde/Kde4GlueCairo.h b/gui/qt/Qt4GlueCairo.h
similarity index 94%
rename from gui/kde/Kde4GlueCairo.h
rename to gui/qt/Qt4GlueCairo.h
index 92fd59b..7f8d75c 100644
--- a/gui/kde/Kde4GlueCairo.h
+++ b/gui/qt/Qt4GlueCairo.h
@@ -24,7 +24,7 @@
#include "gnashconfig.h"
#endif
-#include "Kde4Glue.h"
+#include "Qt4Glue.h"
#include <memory> // for auto_ptr
#include <QImage>
@@ -39,11 +39,11 @@ class QRect;
namespace gnash
{
-class Kde4CairoGlue : public Kde4Glue
+class Qt4CairoGlue : public Qt4Glue
{
public:
- Kde4CairoGlue();
- ~Kde4CairoGlue();
+ Qt4CairoGlue();
+ ~Qt4CairoGlue();
bool init(int argc, char **argv[]);
void initBuffer(int width, int height);
diff --git a/gui/kde/Kde4GlueOgl.cpp b/gui/qt/Qt4GlueOgl.cpp
similarity index 85%
rename from gui/kde/Kde4GlueOgl.cpp
rename to gui/qt/Qt4GlueOgl.cpp
index 1c347d1..c937acf 100644
--- a/gui/kde/Kde4GlueOgl.cpp
+++ b/gui/qt/Qt4GlueOgl.cpp
@@ -25,8 +25,8 @@
#include <QGLWidget>
#include <QRect>
-#include "Kde4GlueOgl.h"
-#include "Kde4Gui.h"
+#include "Qt4GlueOgl.h"
+#include "Qt4Gui.h"
#include "Renderer.h"
#include "Renderer_ogl.h"
#include "GnashException.h"
@@ -34,7 +34,7 @@
namespace gnash
{
-Kde4OglGlue::Kde4OglGlue()
+Qt4OglGlue::Qt4OglGlue()
:
_width(0),
_height(0),
@@ -42,19 +42,19 @@ Kde4OglGlue::Kde4OglGlue()
{
}
-Kde4OglGlue::~Kde4OglGlue()
+Qt4OglGlue::~Qt4OglGlue()
{
}
bool
-Kde4OglGlue::init(int /* argc */, char *** /* argv */)
+Qt4OglGlue::init(int /* argc */, char *** /* argv */)
{
return true;
}
void
-Kde4OglGlue::prepDrawingArea(DrawingWidget *drawing_area)
+Qt4OglGlue::prepDrawingArea(DrawingWidget *drawing_area)
{
assert(drawing_area);
_drawing_area = drawing_area;
@@ -68,7 +68,7 @@ Kde4OglGlue::prepDrawingArea(DrawingWidget *drawing_area)
void
-Kde4OglGlue::render()
+Qt4OglGlue::render()
{
assert(_drawing_area);
_drawing_area->_glWidget->swapBuffers();
@@ -76,14 +76,14 @@ Kde4OglGlue::render()
void
-Kde4OglGlue::render(const QRect& /*updateRect*/)
+Qt4OglGlue::render(const QRect& /*updateRect*/)
{
render();
}
Renderer*
-Kde4OglGlue::createRenderHandler()
+Qt4OglGlue::createRenderHandler()
{
_renderer = create_Renderer_ogl();
diff --git a/gui/kde/Kde4GlueOgl.h b/gui/qt/Qt4GlueOgl.h
similarity index 93%
rename from gui/kde/Kde4GlueOgl.h
rename to gui/qt/Qt4GlueOgl.h
index 24c3ab7..6c7704f 100644
--- a/gui/kde/Kde4GlueOgl.h
+++ b/gui/qt/Qt4GlueOgl.h
@@ -24,7 +24,7 @@
#include "gnashconfig.h"
#endif
-#include "Kde4Glue.h"
+#include "Qt4Glue.h"
#include <boost/scoped_array.hpp>
#include "snappingrange.h"
@@ -35,11 +35,11 @@ class QWidget;
namespace gnash
{
-class Kde4OglGlue : public Kde4Glue
+class Qt4OglGlue : public Qt4Glue
{
public:
- Kde4OglGlue();
- ~Kde4OglGlue();
+ Qt4OglGlue();
+ ~Qt4OglGlue();
bool init(int argc, char **argv[]);
void prepDrawingArea(DrawingWidget *drawing_area);
diff --git a/gui/kde/Kde4Gui.cpp b/gui/qt/Qt4Gui.cpp
similarity index 94%
rename from gui/kde/Kde4Gui.cpp
rename to gui/qt/Qt4Gui.cpp
index 6cb34ce..cb77270 100644
--- a/gui/kde/Kde4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -1,4 +1,4 @@
-// Kde4Gui.cpp: KDE4/Qt4 Gui implementation for Gnash window
+// Qt4Gui.cpp: KDE4/Qt4 Gui implementation for Gnash window
//
// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
// Foundation, Inc
@@ -63,8 +63,8 @@
#include "log.h"
#include "gui.h"
-#include "Kde4Gui.h"
-#include "Kde4Gui.moc"
+#include "Qt4Gui.h"
+#include "Qt4Gui.moc"
#include "Renderer.h"
#include "RunResources.h"
@@ -78,18 +78,18 @@ extern "C" {
namespace gnash
{
-Kde4Gui::Kde4Gui(unsigned long xid, float scale, bool loop, RunResources& r)
+Qt4Gui::Qt4Gui(unsigned long xid, float scale, bool loop, RunResources& r)
: Gui(xid, scale, loop, r)
{
}
-Kde4Gui::~Kde4Gui()
+Qt4Gui::~Qt4Gui()
{
}
void
-Kde4Gui::setClipboard(const std::string& copy)
+Qt4Gui::setClipboard(const std::string& copy)
{
QClipboard* cb = QApplication::clipboard();
assert(cb);
@@ -97,7 +97,7 @@ Kde4Gui::setClipboard(const std::string& copy)
}
bool
-Kde4Gui::init(int /*argc*/, char ** /*argv*/[])
+Qt4Gui::init(int /*argc*/, char ** /*argv*/[])
{
char** r = NULL;
@@ -117,7 +117,7 @@ Kde4Gui::init(int /*argc*/, char ** /*argv*/[])
if (renderer == "cairo") {
#ifdef RENDERER_CAIRO
log_debug("Using Cairo renderer");
- _glue.reset(new Kde4CairoGlue());
+ _glue.reset(new Qt4CairoGlue());
#else
log_error(_("Cairo renderer not supported!"));
return false;
@@ -125,7 +125,7 @@ Kde4Gui::init(int /*argc*/, char ** /*argv*/[])
} else if (renderer == "opengl") {
#ifdef RENDERER_OPENGL
log_debug("Using OpenGL renderer");
- _glue.reset(new Kde4OglGlue());
+ _glue.reset(new Qt4OglGlue());
#else
log_error(_("OpenGL renderer not supported!"));
return false;
@@ -133,7 +133,7 @@ Kde4Gui::init(int /*argc*/, char ** /*argv*/[])
} else {
#ifdef RENDERER_AGG
log_debug("Using AGG renderer");
- _glue.reset(new Kde4AggGlue());
+ _glue.reset(new Qt4AggGlue());
#else
log_error(_("AGG renderer not supported!"));
return false;
@@ -156,13 +156,13 @@ Kde4Gui::init(int /*argc*/, char ** /*argv*/[])
bool
-Kde4Gui::run()
+Qt4Gui::run()
{
return _application->exec();
}
bool
-Kde4Gui::createWindow(const char* windowtitle, int width, int height,
+Qt4Gui::createWindow(const char* windowtitle, int width, int height,
int xPosition, int yPosition)
{
_width = width;
@@ -214,7 +214,7 @@ Kde4Gui::createWindow(const char* windowtitle, int width,
int height,
void
-Kde4Gui::resizeWindow(int width, int height)
+Qt4Gui::resizeWindow(int width, int height)
{
_width = width;
_height = height;
@@ -223,7 +223,7 @@ Kde4Gui::resizeWindow(int width, int height)
}
void
-Kde4Gui::popupMenu(const QPoint& point)
+Qt4Gui::popupMenu(const QPoint& point)
{
QMenu popupMenu(_drawingWidget);
popupMenu.addMenu(fileMenu);
@@ -235,7 +235,7 @@ Kde4Gui::popupMenu(const QPoint& point)
void
-Kde4Gui::renderBuffer()
+Qt4Gui::renderBuffer()
{
for (DrawBounds::const_iterator i = _drawbounds.begin(),
@@ -255,7 +255,7 @@ Kde4Gui::renderBuffer()
void
-Kde4Gui::renderWidget(const QRect& updateRect)
+Qt4Gui::renderWidget(const QRect& updateRect)
{
// This call renders onto the widget using a QPainter,
// which *must only happen inside a paint event*.
@@ -264,7 +264,7 @@ Kde4Gui::renderWidget(const QRect& updateRect)
void
-Kde4Gui::setInvalidatedRegions(const InvalidatedRanges& ranges)
+Qt4Gui::setInvalidatedRegions(const InvalidatedRanges& ranges)
{
_renderer->set_invalidated_regions(ranges);
@@ -289,7 +289,7 @@ Kde4Gui::setInvalidatedRegions(const InvalidatedRanges&
ranges)
void
-Kde4Gui::setTimeout(unsigned int timeout)
+Qt4Gui::setTimeout(unsigned int timeout)
{
// This must go through Gui::quit() to make sure screenshots are
// handled if necessary.
@@ -298,14 +298,14 @@ Kde4Gui::setTimeout(unsigned int timeout)
void
-Kde4Gui::setInterval(unsigned int interval)
+Qt4Gui::setInterval(unsigned int interval)
{
_drawingWidget->startTimer(interval);
}
void
-Kde4Gui::setCursor(gnash_cursor_type newcursor)
+Qt4Gui::setCursor(gnash_cursor_type newcursor)
{
if (! _mouseShown) return;
@@ -322,7 +322,7 @@ Kde4Gui::setCursor(gnash_cursor_type newcursor)
}
bool
-Kde4Gui::showMouse(bool show)
+Qt4Gui::showMouse(bool show)
{
bool prevState = _mouseShown;
_mouseShown = show;
@@ -338,7 +338,7 @@ Kde4Gui::showMouse(bool show)
}
void
-Kde4Gui::setFullscreen()
+Qt4Gui::setFullscreen()
{
_fullscreen = true;
fullscreenAction->setChecked(_fullscreen);
@@ -348,7 +348,7 @@ Kde4Gui::setFullscreen()
}
void
-Kde4Gui::unsetFullscreen()
+Qt4Gui::unsetFullscreen()
{
_fullscreen = false;
fullscreenAction->setChecked(_fullscreen);
@@ -363,7 +363,7 @@ Kde4Gui::unsetFullscreen()
}
double
-Kde4Gui::getScreenDPI() const
+Qt4Gui::getScreenDPI() const
{
assert(_drawingWidget);
// Should this be logical or physical DPI?
@@ -371,7 +371,7 @@ Kde4Gui::getScreenDPI() const
}
std::pair<int, int>
-Kde4Gui::screenResolution() const
+Qt4Gui::screenResolution() const
{
QDesktopWidget* d = QApplication::desktop();
assert(d);
@@ -381,7 +381,7 @@ Kde4Gui::screenResolution() const
}
gnash::key::code
-Kde4Gui::qtToGnashKey(QKeyEvent *event)
+Qt4Gui::qtToGnashKey(QKeyEvent *event)
{
// This should be initialized by now.
@@ -434,7 +434,7 @@ Kde4Gui::qtToGnashKey(QKeyEvent *event)
int
-Kde4Gui::qtToGnashModifier(const Qt::KeyboardModifiers modifiers)
+Qt4Gui::qtToGnashModifier(const Qt::KeyboardModifiers modifiers)
{
int gnashModifier = gnash::key::GNASH_MOD_NONE;
@@ -449,7 +449,7 @@ Kde4Gui::qtToGnashModifier(const Qt::KeyboardModifiers
modifiers)
}
void
-Kde4Gui::handleKeyEvent(QKeyEvent *event, bool down)
+Qt4Gui::handleKeyEvent(QKeyEvent *event, bool down)
{
gnash::key::code c = qtToGnashKey(event);
int mod = qtToGnashModifier(event->modifiers());
@@ -458,14 +458,14 @@ Kde4Gui::handleKeyEvent(QKeyEvent *event, bool down)
void
-Kde4Gui::resize(int width, int height)
+Qt4Gui::resize(int width, int height)
{
_glue->resize(width, height);
resize_view(width, height);
}
void
-Kde4Gui::showProperties()
+Qt4Gui::showProperties()
{
QDialog* propsDialog = new QDialog(_drawingWidget);
propsDialog->setWindowTitle(_q("Movie properties"));
@@ -552,9 +552,9 @@ Kde4Gui::showProperties()
void
-Kde4Gui::showPreferences()
+Qt4Gui::showPreferences()
{
- Kde4GuiPrefs::PreferencesDialog* prefsDialog = new
Kde4GuiPrefs::PreferencesDialog(_drawingWidget);
+ Qt4GuiPrefs::PreferencesDialog* prefsDialog = new
Qt4GuiPrefs::PreferencesDialog(_drawingWidget);
prefsDialog->setAttribute(Qt::WA_DeleteOnClose);
prefsDialog->show();
@@ -564,14 +564,14 @@ Kde4Gui::showPreferences()
void
-Kde4Gui::quitUI()
+Qt4Gui::quitUI()
{
_application->quit();
}
void
-Kde4Gui::setupActions()
+Qt4Gui::setupActions()
{
// File Menu actions
@@ -620,7 +620,7 @@ Kde4Gui::setupActions()
void
-Kde4Gui::setupMenus()
+Qt4Gui::setupMenus()
{
/// The menus are children of the QMainWindow so that
/// they are destroyed on exit. The QMainWindow already has
@@ -650,7 +650,7 @@ Kde4Gui::setupMenus()
void
-Kde4Gui::createMainMenu()
+Qt4Gui::createMainMenu()
{
std::auto_ptr<QMenuBar> mainMenu(new QMenuBar);
@@ -667,7 +667,7 @@ Kde4Gui::createMainMenu()
}
void
-Kde4Gui::setupKeyMap()
+Qt4Gui::setupKeyMap()
{
// We only want to do this once, although it would not
// be harmful to do it more.
@@ -708,20 +708,20 @@ Kde4Gui::setupKeyMap()
}
void
-Kde4Gui::playHook()
+Qt4Gui::playHook()
{
_embedWidget->hidePlayButton();
}
void
-Kde4Gui::stopHook()
+Qt4Gui::stopHook()
{
_embedWidget->showPlayButton();
}
/// EmbedWidget implementation
-EmbedWidget::EmbedWidget(Kde4Gui& gui)
+EmbedWidget::EmbedWidget(Qt4Gui& gui)
: QX11EmbedWidget()
{
_drawingWidget = new DrawingWidget(gui);
@@ -750,7 +750,7 @@ EmbedWidget::showPlayButton()
_playButton->show();
}
-namespace Kde4GuiPrefs {
+namespace Qt4GuiPrefs {
PreferencesDialog::PreferencesDialog(QWidget* parent)
:
@@ -1022,7 +1022,7 @@ PreferencesDialog::savePreferences()
emit accept();
}
-} // End of Kde4GuiPrefs namespace
+} // End of Qt4GuiPrefs namespace
}
diff --git a/gui/kde/Kde4Gui.h b/gui/qt/Qt4Gui.h
similarity index 94%
rename from gui/kde/Kde4Gui.h
rename to gui/qt/Qt4Gui.h
index cf954e8..eb7632f 100644
--- a/gui/kde/Kde4Gui.h
+++ b/gui/qt/Qt4Gui.h
@@ -31,15 +31,15 @@
#include <QDialog>
#ifdef RENDERER_AGG
-#include "Kde4GlueAgg.h"
+#include "Qt4GlueAgg.h"
#endif
#ifdef RENDERER_CAIRO
-#include "Kde4GlueCairo.h"
+#include "Qt4GlueCairo.h"
#endif
#ifdef RENDERER_OPENGL
-#include "Kde4GlueOgl.h"
+#include "Qt4GlueOgl.h"
class QGLWidget;
#endif
@@ -55,7 +55,7 @@ class QSpinBox;
class QStackedWidget;
namespace gnash {
- class Kde4Gui;
+ class Qt4Gui;
class DrawingWidget;
}
@@ -67,7 +67,7 @@ class EmbedWidget : public QX11EmbedWidget
Q_OBJECT
public:
- EmbedWidget(Kde4Gui& gui);
+ EmbedWidget(Qt4Gui& gui);
~EmbedWidget() {};
DrawingWidget* drawingWidget() { return _drawingWidget; }
@@ -82,11 +82,11 @@ private:
};
-class DSOEXPORT Kde4Gui : public Gui
+class DSOEXPORT Qt4Gui : public Gui
{
public:
- Kde4Gui(unsigned long xid, float scale, bool loop, RunResources& r);
- virtual ~Kde4Gui();
+ Qt4Gui(unsigned long xid, float scale, bool loop, RunResources& r);
+ virtual ~Qt4Gui();
virtual bool init(int argc, char **argv[]);
virtual bool createWindow(const char* windowtitle, int width, int height,
int xPosition = 0, int yPosition = 0);
@@ -150,7 +150,7 @@ private:
DrawingWidget* _drawingWidget;
/// Takes care of painting onto the widget.
- std::auto_ptr<Kde4Glue> _glue;
+ std::auto_ptr<Qt4Glue> _glue;
/// The main application window.
std::auto_ptr<QMainWindow> _window;
@@ -190,7 +190,7 @@ private:
QAction* fullscreenAction;
};
-namespace Kde4GuiPrefs
+namespace Qt4GuiPrefs
{
class PreferencesDialog : public QDialog
diff --git a/gui/kde/Kde4Gui.moc.in b/gui/qt/Qt4Gui.moc.in
similarity index 72%
rename from gui/kde/Kde4Gui.moc.in
rename to gui/qt/Qt4Gui.moc.in
index b84a79e..eece13c 100644
--- a/gui/kde/Kde4Gui.moc.in
+++ b/gui/qt/Qt4Gui.moc.in
@@ -1,17 +1,17 @@
/****************************************************************************
-** Meta object code from reading C++ file 'Kde4Gui.h'
+** Meta object code from reading C++ file 'Qt4Gui.h'
**
-** Created: Mon Mar 22 09:59:37 2010
-** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
+** Created: Wed Mar 23 11:02:13 2011
+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.3)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "Kde4Gui.h"
+#include "../../../trunk/gui/qt/Qt4Gui.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'Kde4Gui.h' doesn't include <QObject>."
+#error "The header file 'Qt4Gui.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 62
-#error "This file was generated using the moc from 4.6.2. It"
+#error "This file was generated using the moc from 4.6.3. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -79,7 +79,7 @@ int gnash::EmbedWidget::qt_metacall(QMetaObject::Call _c, int
_id, void **_a)
}
return _id;
}
-static const uint qt_meta_data_gnash__Kde4GuiPrefs__PreferencesDialog[] = {
+static const uint qt_meta_data_gnash__Qt4GuiPrefs__PreferencesDialog[] = {
// content:
4, // revision
@@ -93,39 +93,39 @@ static const uint
qt_meta_data_gnash__Kde4GuiPrefs__PreferencesDialog[] = {
0, // signalCount
// slots: signature, parameters, type, tag, flags
- 40, 39, 39, 39, 0x08,
+ 39, 38, 38, 38, 0x08,
0 // eod
};
-static const char qt_meta_stringdata_gnash__Kde4GuiPrefs__PreferencesDialog[]
= {
- "gnash::Kde4GuiPrefs::PreferencesDialog\0"
+static const char qt_meta_stringdata_gnash__Qt4GuiPrefs__PreferencesDialog[] =
{
+ "gnash::Qt4GuiPrefs::PreferencesDialog\0"
"\0savePreferences()\0"
};
-const QMetaObject gnash::Kde4GuiPrefs::PreferencesDialog::staticMetaObject = {
- { &QDialog::staticMetaObject,
qt_meta_stringdata_gnash__Kde4GuiPrefs__PreferencesDialog,
- qt_meta_data_gnash__Kde4GuiPrefs__PreferencesDialog, 0 }
+const QMetaObject gnash::Qt4GuiPrefs::PreferencesDialog::staticMetaObject = {
+ { &QDialog::staticMetaObject,
qt_meta_stringdata_gnash__Qt4GuiPrefs__PreferencesDialog,
+ qt_meta_data_gnash__Qt4GuiPrefs__PreferencesDialog, 0 }
};
#ifdef Q_NO_DATA_RELOCATION
-const QMetaObject
&gnash::Kde4GuiPrefs::PreferencesDialog::getStaticMetaObject() { return
staticMetaObject; }
+const QMetaObject
&gnash::Qt4GuiPrefs::PreferencesDialog::getStaticMetaObject() { return
staticMetaObject; }
#endif //Q_NO_DATA_RELOCATION
-const QMetaObject *gnash::Kde4GuiPrefs::PreferencesDialog::metaObject() const
+const QMetaObject *gnash::Qt4GuiPrefs::PreferencesDialog::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject :
&staticMetaObject;
}
-void *gnash::Kde4GuiPrefs::PreferencesDialog::qt_metacast(const char *_clname)
+void *gnash::Qt4GuiPrefs::PreferencesDialog::qt_metacast(const char *_clname)
{
if (!_clname) return 0;
- if (!strcmp(_clname,
qt_meta_stringdata_gnash__Kde4GuiPrefs__PreferencesDialog))
+ if (!strcmp(_clname,
qt_meta_stringdata_gnash__Qt4GuiPrefs__PreferencesDialog))
return static_cast<void*>(const_cast< PreferencesDialog*>(this));
return QDialog::qt_metacast(_clname);
}
-int gnash::Kde4GuiPrefs::PreferencesDialog::qt_metacall(QMetaObject::Call _c,
int _id, void **_a)
+int gnash::Qt4GuiPrefs::PreferencesDialog::qt_metacall(QMetaObject::Call _c,
int _id, void **_a)
{
_id = QDialog::qt_metacall(_c, _id, _a);
if (_id < 0)
diff --git a/gui/kde/gui_kde.cpp b/gui/qt/gui_kde.cpp
similarity index 100%
rename from gui/kde/gui_kde.cpp
rename to gui/qt/gui_kde.cpp
diff --git a/gui/kde/kde.cpp b/gui/qt/kde.cpp
similarity index 100%
rename from gui/kde/kde.cpp
rename to gui/qt/kde.cpp
diff --git a/gui/kde/kde3.am b/gui/qt/kde3.am
similarity index 100%
rename from gui/kde/kde3.am
rename to gui/qt/kde3.am
diff --git a/gui/kde/kde_glue.h b/gui/qt/kde_glue.h
similarity index 100%
rename from gui/kde/kde_glue.h
rename to gui/qt/kde_glue.h
diff --git a/gui/kde/kde_glue_agg.cpp b/gui/qt/kde_glue_agg.cpp
similarity index 100%
rename from gui/kde/kde_glue_agg.cpp
rename to gui/qt/kde_glue_agg.cpp
diff --git a/gui/kde/kde_glue_agg.h b/gui/qt/kde_glue_agg.h
similarity index 100%
rename from gui/kde/kde_glue_agg.h
rename to gui/qt/kde_glue_agg.h
diff --git a/gui/kde/kde_glue_opengl.cpp b/gui/qt/kde_glue_opengl.cpp
similarity index 100%
rename from gui/kde/kde_glue_opengl.cpp
rename to gui/qt/kde_glue_opengl.cpp
diff --git a/gui/kde/kde_glue_opengl.h b/gui/qt/kde_glue_opengl.h
similarity index 100%
rename from gui/kde/kde_glue_opengl.h
rename to gui/qt/kde_glue_opengl.h
diff --git a/gui/kde/kdesup.h b/gui/qt/kdesup.h
similarity index 100%
rename from gui/kde/kdesup.h
rename to gui/qt/kdesup.h
diff --git a/gui/kde/klash3.moc.in b/gui/qt/klash3.moc.in
similarity index 100%
rename from gui/kde/klash3.moc.in
rename to gui/qt/klash3.moc.in
diff --git a/gui/kde/kde4.am b/gui/qt/qt4.am
similarity index 53%
rename from gui/kde/kde4.am
rename to gui/qt/qt4.am
index 859afd5..a8edd74 100644
--- a/gui/kde/kde4.am
+++ b/gui/qt/qt4.am
@@ -16,64 +16,64 @@
#
#
-# Build the KDE gui
+# Build the Qt gui
#
if BUILD_QT4_GUI
-Kde4Gui.moc: $(srcdir)/kde/Kde4Gui.h
+Qt4Gui.moc: $(srcdir)/qt/Qt4Gui.h
@if test x"$(MOC4)" != x; then \
- echo "Generating MOC file: Kde4Gui.moc."; \
- $(MOC4) $(srcdir)/kde/Kde4Gui.h -o Kde4Gui.moc; \
+ echo "Generating MOC file: Qt4Gui.moc."; \
+ $(MOC4) $(srcdir)/qt/Qt4Gui.h -o Qt4Gui.moc; \
else \
echo "WARNING: Install QT 4.x moc tool! Using default MOC file"; \
- ln -sf $(srcdir)/kde/Kde4Gui.moc.in Kde4Gui.moc; \
+ ln -sf $(srcdir)/qt/Qt4Gui.moc.in Qt4Gui.moc; \
fi
-Kde4Glue.moc: $(srcdir)/kde/Kde4Glue.h
+Qt4Glue.moc: $(srcdir)/qt/Qt4Glue.h
@if test x"$(MOC4)" != x; then \
- echo "Generating MOC file: Kde4Glue.moc."; \
- $(MOC4) $(srcdir)/kde/Kde4Glue.h -o Kde4Glue.moc; \
+ echo "Generating MOC file: Qt4Glue.moc."; \
+ $(MOC4) $(srcdir)/qt/Qt4Glue.h -o Qt4Glue.moc; \
else \
echo "WARNING: Install QT 4.x moc tool! Using default MOC file"; \
- ln -sf $(srcdir)/kde/Kde4Glue.moc.in Kde4Glue.moc; \
+ ln -sf $(srcdir)/qt/Qt4Glue.moc.in Qt4Glue.moc; \
fi
endif
-bin_PROGRAMS += kde4-gnash
+bin_PROGRAMS += qt4-gnash
-kde4_gnash_SOURCES = $(GUI_SRCS) \
- kde/GuiKde4.cpp \
- kde/Kde4Gui.cpp \
- kde/Kde4Glue.cpp \
- kde/Kde4Gui.h \
- kde/Kde4Glue.h
+qt4_gnash_SOURCES = $(GUI_SRCS) \
+ qt/GuiQt4.cpp \
+ qt/Qt4Gui.cpp \
+ qt/Qt4Glue.cpp \
+ qt/Qt4Gui.h \
+ qt/Qt4Glue.h
-kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS)
$(QT4_CFLAGS)
-kde4_gnash_LDFLAGS = -export-dynamic
-kde4_gnash_LDADD = \
+qt4_gnash_CPPFLAGS = -DGUI_QT4 -DGUI_CONFIG=\"QT4\" $(AM_CPPFLAGS)
$(QT4_CFLAGS)
+qt4_gnash_LDFLAGS = -export-dynamic
+qt4_gnash_LDADD = \
$(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS) \
$(LIBVA_X11_LIBS)
if BUILD_OGL_RENDERER
-kde4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
+qt4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+qt4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(OGL_LIBS) -lQtOpenGL
-kde4_gnash_SOURCES += kde/Kde4GlueOgl.cpp kde/Kde4GlueOgl.h
+qt4_gnash_SOURCES += qt/Qt4GlueOgl.cpp qt/Qt4GlueOgl.h
endif # BUILD_OGL_RENDERER
if BUILD_CAIRO_RENDERER
-kde4_gnash_CPPFLAGS += $(CAIRO_CFLAGS) $(X11_CFLAGS)
-kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
+qt4_gnash_CPPFLAGS += $(CAIRO_CFLAGS) $(X11_CFLAGS)
+qt4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(CAIRO_LIBS)
-kde4_gnash_SOURCES += kde/Kde4GlueCairo.cpp kde/Kde4GlueCairo.h
+qt4_gnash_SOURCES += qt/Qt4GlueCairo.cpp qt/Qt4GlueCairo.h
endif # BUILD_CAIRO_RENDERER
if BUILD_AGG_RENDERER
-kde4_gnash_CPPFLAGS += $(AGG_CFLAGS) $(X11_CFLAGS)
-kde4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
+qt4_gnash_CPPFLAGS += $(AGG_CFLAGS) $(X11_CFLAGS)
+qt4_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
$(QT4_LIBS) $(AGG_LIBS)
-kde4_gnash_SOURCES += kde/Kde4GlueAgg.cpp kde/Kde4GlueAgg.h
+qt4_gnash_SOURCES += qt/Qt4GlueAgg.cpp qt/Qt4GlueAgg.h
endif
diff --git a/gui/kde/qtopia3.am b/gui/qt/qtopia3.am
similarity index 100%
rename from gui/kde/qtopia3.am
rename to gui/qt/qtopia3.am
diff --git a/packaging/debian/gnash-klash.install
b/packaging/debian/gnash-klash.install
index 4981b63..3c85df4 100644
--- a/packaging/debian/gnash-klash.install
+++ b/packaging/debian/gnash-klash.install
@@ -1,4 +1,4 @@
usr/share/kde4/apps/klash/*
usr/lib/kde4/*
-usr/bin/kde4-gnash
+usr/bin/qt4-gnash
usr/share/kde4/services/klash_part.desktop
diff --git a/packaging/debian/klash.desktop.in
b/packaging/debian/klash.desktop.in
index f6816d2..eec6e56 100644
--- a/packaging/debian/klash.desktop.in
+++ b/packaging/debian/klash.desktop.in
@@ -6,6 +6,6 @@ Name[fi]=Gnash-SWF-katselin (KDE)
GenericName=
Comment=
Icon=/usr/share/pixmaps/klash.xpm
-Exec=/usr/bin/kde4-gnash
+Exec=/usr/bin/qt4-gnash
Terminal=false
Categories=Application;AudioVideo;KDE;
diff --git a/packaging/debian/klash.install b/packaging/debian/klash.install
index b575d46..d2c2d9f 100644
--- a/packaging/debian/klash.install
+++ b/packaging/debian/klash.install
@@ -1,4 +1,4 @@
-usr/bin/kde4-gnash
-usr/share/man/man1/kde4-gnash.1*
+usr/bin/qt4-gnash
+usr/share/man/man1/qt4-gnash.1*
usr/share/pixmaps/klash.xpm
usr/share/applications/klash.desktop
diff --git a/packaging/debian/klash.lintian-overrides
b/packaging/debian/klash.lintian-overrides
index 38d6aa8..28bdf21 100644
--- a/packaging/debian/klash.lintian-overrides
+++ b/packaging/debian/klash.lintian-overrides
@@ -1 +1 @@
-klash: binary-or-shlib-defines-rpath ./usr/bin/kde4-gnash /usr/lib/gnash
+klash: binary-or-shlib-defines-rpath ./usr/bin/qt4-gnash /usr/lib/gnash
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 68da710..fa599e2 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -100,7 +100,7 @@ else
BUILD_FLAGS += --enable-media=gst,ffmpeg
endif
-# Optionally build the older kde3 package, KDE4 is the default
+# Optionally build the older kde3 package, Qt4 is the default
ifneq (,$(findstring kde3,$(DEB_BUILD_OPTIONS)))
BUILD_FLAGS += --enable-gui=gtk,kde3
BUILD_VERSION = $(MAIN_VERSION).kde3.$(BUILD_VERSION)
@@ -113,7 +113,7 @@ else
BUILD_DEBUG = -kde3
endif
else
- BUILD_FLAGS += --enable-gui=gtk,kde4
+ BUILD_FLAGS += --enable-gui=gtk,qt4
endif
# Configure Gnash. We use a different set of options, as when building
@@ -121,7 +121,7 @@ endif
# python support, the SDK cygnal, etc... These are not enabled by
# default to make it less complicated for end users building Gnash
# from source.
-# for now, only build the kde4 support, as kde3 is being depreciated.
+# for now, only build the qt4 support, as kde3 is being depreciated.
CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
--host=$(DEB_HOST_GNU_TYPE) \
@@ -263,7 +263,7 @@ install: build
install -d $(CURDIR)/debian/tmp/usr/share/applications/
cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/gtk-gnash.1
- gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/kde4-gnash.1
+ gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/qt4-gnash.1
# CREATE PACKAGES
diff --git a/packaging/ltib/gnash.spec b/packaging/ltib/gnash.spec
index 2d97332..4371050 100644
--- a/packaging/ltib/gnash.spec
+++ b/packaging/ltib/gnash.spec
@@ -51,7 +51,7 @@ Gnash header files can be used to write external Gnash
extensions.
CROSS_OPTS="--host=arm-none-linux=gnueabi
--with-sysroot=/opt/L2.6.31_10.07.11_ER/ltib/rootfs/usr"
# these are actually the default values, but this way they get added
# to the build so they appear in "gnash --version".
-GUI="--enable-gui=fb" # could be kde3, kde4, aqua, sdl
+GUI="--enable-gui=fb" # could be kde3, qt4, aqua, sdl
SOUND="--enable-media=ffmpeg"
OTHER="--disable-jemalloc"
RENDERER="--enable-renderer=agg" # could be opengl or cairo
diff --git a/packaging/redhat/klash.spec b/packaging/redhat/klash.spec
index 84f5b66..4a00c21 100644
--- a/packaging/redhat/klash.spec
+++ b/packaging/redhat/klash.spec
@@ -65,7 +65,7 @@ The gnash SWF player plugin for Konqueror in KDE4.
# Native RPM build
CROSS_OPTS="" # "--enable-ghelp --enable-docbook"
-GUI="" # --enable-gui=gtk,kde3,kde4
+GUI="" # --enable-gui=gtk,kde3,qt4
SOUND="--enable-media=ffmpeg --enable-jemalloc"
RENDERER="" # --enable-render=ogl
# KDE3_OPTS="--with-kde3-plugindir=%{_libdir}/kde3/plugins \
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 6 +-
configure.ac | 22 ++---
gui/Makefile.am | 36 +++------
gui/Player.cpp | 4 +-
gui/gnash.in | 2 +-
gui/gui.h | 2 +-
gui/kde/GuiKde4.cpp | 47 -----------
gui/{sdl/gui_sdl.cpp => qt/GuiQt4.cpp} | 18 ++--
gui/{kde/Kde4Glue.cpp => qt/Qt4Glue.cpp} | 12 ++--
gui/{kde/Kde4Glue.h => qt/Qt4Glue.h} | 12 ++--
gui/{kde/Kde4Glue.moc.in => qt/Qt4Glue.moc.in} | 12 ++--
gui/{kde/Kde4GlueAgg.cpp => qt/Qt4GlueAgg.cpp} | 20 +++---
gui/{kde/Kde4GlueAgg.h => qt/Qt4GlueAgg.h} | 8 +-
gui/{kde/Kde4GlueCairo.cpp => qt/Qt4GlueCairo.cpp} | 22 +++---
gui/{kde/Kde4GlueCairo.h => qt/Qt4GlueCairo.h} | 8 +-
gui/{kde/Kde4GlueOgl.cpp => qt/Qt4GlueOgl.cpp} | 18 ++--
gui/{kde/Kde4GlueOgl.h => qt/Qt4GlueOgl.h} | 8 +-
gui/{kde/Kde4Gui.cpp => qt/Qt4Gui.cpp} | 84 ++++++++++----------
gui/{kde/Kde4Gui.h => qt/Qt4Gui.h} | 20 +++---
gui/{kde/Kde4Gui.moc.in => qt/Qt4Gui.moc.in} | 36 ++++----
gui/{kde => qt}/gui_kde.cpp | 0
gui/{kde => qt}/kde.cpp | 0
gui/{kde => qt}/kde3.am | 0
gui/{kde => qt}/kde_glue.h | 0
gui/{kde => qt}/kde_glue_agg.cpp | 0
gui/{kde => qt}/kde_glue_agg.h | 0
gui/{kde => qt}/kde_glue_opengl.cpp | 0
gui/{kde => qt}/kde_glue_opengl.h | 0
gui/{kde => qt}/kdesup.h | 0
gui/{kde => qt}/klash3.moc.in | 0
gui/{kde/kde4.am => qt/qt4.am} | 56 +++++++-------
gui/{kde => qt}/qtopia3.am | 0
packaging/debian/gnash-klash.install | 2 +-
packaging/debian/klash.desktop.in | 2 +-
packaging/debian/klash.install | 4 +-
packaging/debian/klash.lintian-overrides | 2 +-
packaging/debian/rules | 8 +-
packaging/ltib/gnash.spec | 2 +-
packaging/redhat/klash.spec | 2 +-
39 files changed, 203 insertions(+), 272 deletions(-)
delete mode 100644 gui/kde/GuiKde4.cpp
copy gui/{sdl/gui_sdl.cpp => qt/GuiQt4.cpp} (75%)
rename gui/{kde/Kde4Glue.cpp => qt/Qt4Glue.cpp} (93%)
rename gui/{kde/Kde4Glue.h => qt/Qt4Glue.h} (94%)
rename gui/{kde/Kde4Glue.moc.in => qt/Qt4Glue.moc.in} (89%)
rename gui/{kde/Kde4GlueAgg.cpp => qt/Qt4GlueAgg.cpp} (85%)
rename gui/{kde/Kde4GlueAgg.h => qt/Qt4GlueAgg.h} (94%)
rename gui/{kde/Kde4GlueCairo.cpp => qt/Qt4GlueCairo.cpp} (87%)
rename gui/{kde/Kde4GlueCairo.h => qt/Qt4GlueCairo.h} (94%)
rename gui/{kde/Kde4GlueOgl.cpp => qt/Qt4GlueOgl.cpp} (85%)
rename gui/{kde/Kde4GlueOgl.h => qt/Qt4GlueOgl.h} (93%)
rename gui/{kde/Kde4Gui.cpp => qt/Qt4Gui.cpp} (94%)
rename gui/{kde/Kde4Gui.h => qt/Qt4Gui.h} (94%)
rename gui/{kde/Kde4Gui.moc.in => qt/Qt4Gui.moc.in} (72%)
rename gui/{kde => qt}/gui_kde.cpp (100%)
rename gui/{kde => qt}/kde.cpp (100%)
rename gui/{kde => qt}/kde3.am (100%)
rename gui/{kde => qt}/kde_glue.h (100%)
rename gui/{kde => qt}/kde_glue_agg.cpp (100%)
rename gui/{kde => qt}/kde_glue_agg.h (100%)
rename gui/{kde => qt}/kde_glue_opengl.cpp (100%)
rename gui/{kde => qt}/kde_glue_opengl.h (100%)
rename gui/{kde => qt}/kdesup.h (100%)
rename gui/{kde => qt}/klash3.moc.in (100%)
rename gui/{kde/kde4.am => qt/qt4.am} (53%)
rename gui/{kde => qt}/qtopia3.am (100%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-325-ga8d3d67,
Benjamin Wolsey <=