Skip to content

Commit a9e8d9e

Browse files
author
timlinux
committed
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
1 parent c3275ca commit a9e8d9e

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

src/plugins/plugin_template/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,6 @@ libqgis_plugin_[pluginlcasename]_la_CXXFLAGS = $(CXXFLAGS) \
7676
$(GEOS_CFLAGS) \
7777
-I../../core \
7878
-I../../ui \
79-
-I../../gui
79+
-I../../gui \
80+
» » » -I../../raster
8081
libqgis_plugin_[pluginlcasename]_la_LDFLAGS = -avoid-version -module

src/plugins/plugin_template/plugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ email : tim@linfiniti.com
2525
#include <qgisapp.h>
2626
#include <qgsmaplayer.h>
2727
#include <qgsrasterlayer.h>
28-
#include "plugin.h"
28+
#include "[pluginlcasename].h"
2929

3030

3131
#include <q3toolbar.h>
@@ -41,7 +41,7 @@ email : tim@linfiniti.com
4141
#include <iostream>
4242

4343
//the gui subclass
44-
#include "plugingui.h"
44+
#include "[pluginlcasename]gui.h"
4545

4646
// xpm for creating the toolbar icon
4747
#ifdef WIN32

src/plugins/plugin_template/plugin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "../qgisplugin.h"
4040
#include <qwidget.h>
4141

42-
#include "../../src/qgisapp.h"
42+
#include "../../gui/qgisapp.h"
4343

4444

4545
/**

src/plugins/plugin_template/plugingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
[pluginname]Gui::[pluginname]Gui() : [pluginname]GuiBase()
1919
{
20-
20+
setupUi(this);
2121
}
2222

2323
[pluginname]Gui::[pluginname]Gui( QWidget* parent, Qt::WFlags fl )
2424
: [pluginname]GuiBase( parent, fl )
2525
{
26-
26+
setupUi(this);
2727
}
2828
[pluginname]Gui::~[pluginname]Gui()
2929
{

src/plugins/plugin_template/plugingui.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
#ifndef [pluginname]GUI_H
1313
#define [pluginname]GUI_H
1414

15-
#include <pluginguibase.h>
15+
#include <QDialog>
16+
#include <ui[pluginname]guibase.h>
1617

1718
/**
1819
@author Tim Sutton
1920
*/
20-
class [pluginname]Gui : public [pluginname]GuiBase
21+
class [pluginname]Gui : public QDialog, private Ui::[pluginname]GuiBase
2122
{
2223
Q_OBJECT
2324
public:

0 commit comments

Comments
 (0)