further removal of gqt redundancy, gtk-made-qt tests build

Author: staalmannen

bgqt.sh

@@ -1,19 +1,33 @@
 #!/bin/sh
 if [ ! -n "$1" ]
 then
-	test="test"
+	_test="test"
 	echo "no test specified, running test"
 else
 	echo "running $1"
-	test=$1
+	_test=$1
 fi
 
-# run MOC first
-~/qt4-bin/bin/moc -i gtk/gtk_button.h -o gtk/moc_gtk_button.h
-~/qt4-bin/bin/moc -i gtk/gtk_entry.h -o gtk/moc_gtk_entry.h
-~/qt4-bin/bin/moc -i gtk/gtk_combo.h -o gtk/moc_gtk_combo.h
-g++ "examples/$test.c" -o test -ggdb3 -I/home/w00t/gqt -I/home/w00t/qt4-bin/include -I/home/w00t/qt4-bin/include/QtGui -I/home/w00t/qt4-bin/include/QtUiTools -I/home/w00t/qt4-bin/include/QtCore -L/home/w00t/qt4-bin/lib -lQtCore -lQtGui -l QtUiTools -Wl,--rpath -Wl,/home/w00t/qt4-bin/lib `pkg-config --cflags --libs glib-2.0`
-rm gtk/moc_gtk_button.h
-rm gtk/moc_gtk_entry.h
-rm gtk/moc_gtk_combo.h
-./test -widgetcount
+#various directories. Change if you use another path
+_Here=$(pwd)
+_QtInclude=/usr/include/qt
+_QtLib=/usr/lib
+_QtBin=/usr/lib/qt/bin
+
+#prepare moc headers
+"${_QtBin}"/moc -i include/gtk/gtk_button.h -o include/gtk/moc_gtk_button.h
+"${_QtBin}"/moc -i include/gtk/gtk_entry.h -o include/gtk/moc_gtk_entry.h
+"${_QtBin}"/moc -i include/gtk/gtk_combo.h -o include/gtk/moc_gtk_combo.h
+
+# build library
+qmake-qt5 gtk-made-qt.pro
+make
+
+# compile
+g++ -fPIC "examples/${_test}.c" -o ${_test} -ggdb3 -I"${_Here}"/include -I"${_QtInclude}" -I"${_QtInclude}"/QtGui -I"${_QtInclude}"/QtWidgets -I"${_QtInclude}"/QtUiTools -I"${_QtInclude}"/QtCore -L"${_QtLib}" -L"${_Here}"/lib -lgt -lQt5Core -lQt5Gui -lQt5Widgets -Wl,--rpath -Wl,"${_Here}"/lib
+
+
+./"${_test}" -widgetcount
+
+
+

bgtk.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 if [ ! -n "$1" ]
 then
-	test="test"
+	_test="test"
 	echo "no test specified, running test"
 else
 	echo "running $1"
-	test=$1
+	_test=$1
 fi
 
 # we use g++ (not gcc) because to work with both gqt and gtk, some applications have to use c++ casts..
-g++ -ggdb3 "examples/$test.c" -o test `pkg-config --cflags --libs gtk+-2.0`
-./test
+g++ -ggdb3 "examples/${_test}.c" -o ${_test} `pkg-config --cflags --libs gtk+-2.0`
+./${_test}

include/glib.h

@@ -0,0 +1,6 @@
+
+
+#include "gtk-made-qt.h"
+
+
+ 

include/gtk-made-qt.h

@@ -58,8 +58,8 @@ char *g_strdup(const char *s)
 }
 
 #include "glibtypes.h"
-/* #include "qgtkcallbackbridge.h"
-#include "qgtkeventfilter.h" */ /* missing? */
+#include "qgtkcallbackbridge.h"
+#include "qgtkeventfilter.h" 
 
 #define G_CALLBACK(func) ((void*)(func))
 
@@ -176,7 +176,7 @@ void gtk_widget_set_size_request(QObject *o_w, int width, int height)
 
 // Window modification functions and defines
 
-#define GTK_WINDOW_TOPLEVEL (0)
+#define GTK_WINDOW_TOPLEVEL (0) 
 QWidget *gtk_window_new(int)
 {
     // Seems like all windows can act as a container, see example tablepacking, pick HBoxLayout as std

include/gtk/gtk.h

@@ -1,14 +1,7 @@
 #ifndef __GTK__
 #define __GTK__
 
-// We override parts of glib (like signals), so make sure that glib is *always* included first.
-#ifndef g_signal_connect
-	#warning "You must include glib.h before gtk.h. I'm doing it for you for now."
-	#pragma message("You must include glib.h before gtk.h. I'm doing it for you for now.")
-	#include <glib.h>
-#endif
-
-#include "../gtk-made-qt.h"
+#include "../gtk-made-qt.h" /*replaces glib */
 
 #include <QLabel>
 #include <QHBoxLayout>

src/qgtkcallbackbridge.h include/qgtkcallbackbridge.h

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "qgtkcallbackbridge.h"
+#include <qgtkcallbackbridge.h>
 
 QGtkCallbackBridge::QGtkCallbackBridge(QObject *src, callbackFuncPtr f, void *data, bool swapped) :
     QObject(0), m_f(f), m_data(data), m_swapped(swapped)

src/qgtkdeleteeventfilter.h include/qgtkdeleteeventfilter.h

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "qgtkdeleteeventfilter.h"
+#include <qgtkdeleteeventfilter.h>
 
 #include <QEvent>
 

src/qgtkeventfilter.h include/qgtkeventfilter.h

@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "qgtkeventfilter.h"
+#include <qgtkeventfilter.h>
 
-#include "qgtkdeleteeventfilter.h"
-#include "qgtkgeneraleventfilter.h"
+#include <qgtkdeleteeventfilter.h>
+#include <qgtkgeneraleventfilter.h>
 
 QGtkEventFilter::QGtkEventFilter(eventFuncPtr f, void *data) :
     QObject(0), m_f(f), m_data(data)

src/qgtkgeneraleventfilter.h include/qgtkgeneraleventfilter.h

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "qgtkgeneraleventfilter.h"
+#include <qgtkgeneraleventfilter.h>
 
 #include <QEvent>
 

src/qgtkcallbackbridge.cpp

@@ -16,10 +16,10 @@ SOURCES += \
     qgtkgeneraleventfilter.cpp
 
 HEADERS += \
-    qgtkcallbackbridge.h \
-    qgtkeventfilter.h \
-    qgtkdeleteeventfilter.h \
-    qgtkgeneraleventfilter.h
+    ../include/qgtkcallbackbridge.h \
+    ../include/qgtkeventfilter.h \
+    ../include/qgtkdeleteeventfilter.h \
+    ../include/qgtkgeneraleventfilter.h
 
 HEADERS += \
     ../include/gtk-made-qt.h \