Further updates to port of plugin maker for Qt4...still in progress

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5182 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 6, 2006 · a9e8d9e · a9e8d9e
1 parent c3275ca
commit a9e8d9e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/plugins/plugin_template/Makefile.am b/src/plugins/plugin_template/Makefile.am
@@ -76,5 +76,6 @@ libqgis_plugin_[pluginlcasename]_la_CXXFLAGS = $(CXXFLAGS) \
 			      $(GEOS_CFLAGS) \
 			      -I../../core \
 			      -I../../ui \
-			      -I../../gui 
+			      -I../../gui \
+»   »   »         -I../../raster
 libqgis_plugin_[pluginlcasename]_la_LDFLAGS = -avoid-version -module
diff --git a/src/plugins/plugin_template/plugin.cpp b/src/plugins/plugin_template/plugin.cpp
@@ -25,7 +25,7 @@ email                : tim@linfiniti.com
 #include <qgisapp.h>
 #include <qgsmaplayer.h>
 #include <qgsrasterlayer.h>
-#include "plugin.h"
+#include "[pluginlcasename].h"
 
 
 #include <q3toolbar.h>
@@ -41,7 +41,7 @@ email                : tim@linfiniti.com
 #include <iostream>
 
 //the gui subclass
-#include "plugingui.h"
+#include "[pluginlcasename]gui.h"
 
 // xpm for creating the toolbar icon
 #ifdef WIN32

diff --git a/src/plugins/plugin_template/plugin.h b/src/plugins/plugin_template/plugin.h
@@ -39,7 +39,7 @@
 #include "../qgisplugin.h"
 #include <qwidget.h>
 
-#include "../../src/qgisapp.h"
+#include "../../gui/qgisapp.h"
 
 
 /**

diff --git a/src/plugins/plugin_template/plugingui.cpp b/src/plugins/plugin_template/plugingui.cpp
@@ -17,13 +17,13 @@
 
 [pluginname]Gui::[pluginname]Gui() : [pluginname]GuiBase()
 {
-
+  setupUi(this);
 }
 
 [pluginname]Gui::[pluginname]Gui( QWidget* parent, Qt::WFlags fl )
 : [pluginname]GuiBase( parent, fl )
 {
-   
+  setupUi(this);
 }  
 [pluginname]Gui::~[pluginname]Gui()
 {

diff --git a/src/plugins/plugin_template/plugingui.h b/src/plugins/plugin_template/plugingui.h
@@ -12,12 +12,13 @@
 #ifndef [pluginname]GUI_H
 #define [pluginname]GUI_H
 
-#include <pluginguibase.h>
+#include <QDialog>
+#include <ui[pluginname]guibase.h>
 
 /**
 @author Tim Sutton
 */
-class [pluginname]Gui : public [pluginname]GuiBase
+class [pluginname]Gui : public QDialog, private Ui::[pluginname]GuiBase
 {
 Q_OBJECT
 public: