Fix build error caused by incorrect includes.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2981 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2005-03-17 00:42:44 +00:00
parent cdc2983109
commit 9a5be668c0
8 changed files with 49 additions and 5 deletions

View File

@ -20,6 +20,7 @@
#include <qcursor.h> #include <qcursor.h>
#include <qapplication.h> #include <qapplication.h>
#include <iostream>
//plugin includes //plugin includes
#include "qgslocationcapturewidget.h" #include "qgslocationcapturewidget.h"
@ -72,6 +73,7 @@ void PluginGui::pbnCancel_clicked()
void PluginGui::pbnGetCoords_clicked() void PluginGui::pbnGetCoords_clicked()
{ {
std::cout << "Get coords clicked" << std::endl;
QgsLocationCaptureWidget * myWidget = new QgsLocationCaptureWidget(); QgsLocationCaptureWidget * myWidget = new QgsLocationCaptureWidget();
myWidget->show(); myWidget->show();
delete myWidget; delete myWidget;

View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'pluginguibase.ui' ** Form implementation generated from reading ui file 'pluginguibase.ui'
** **
** Created: Tue Mar 15 01:31:07 2005 ** Created: Wed Mar 16 23:39:35 2005
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!

View File

@ -17,6 +17,7 @@
#include "qgslocationcapturewidget.h" #include "qgslocationcapturewidget.h"
#include <qgspoint.h> #include <qgspoint.h>
#include <qlabel.h>
QgsLocationCaptureWidget::QgsLocationCaptureWidget( QWidget *parent, const char * name, WFlags f) QgsLocationCaptureWidget::QgsLocationCaptureWidget( QWidget *parent, const char * name, WFlags f)
:QgsLocationCaptureWidgetBase( parent, name, f) :QgsLocationCaptureWidgetBase( parent, name, f)

View File

@ -17,9 +17,9 @@
#define QGSLOCATIONCAPTUREWIDGET_H #define QGSLOCATIONCAPTUREWIDGET_H
#ifdef WIN32 #ifdef WIN32
#include "qgslocationcapturewidgetbase.h"
#else
#include "qgslocationcapturewidgetbase.uic.h" #include "qgslocationcapturewidgetbase.uic.h"
#else
#include "qgslocationcapturewidgetbase.h"
#endif #endif
class QgsLocationCaptureWidget:public QgsLocationCaptureWidgetBase class QgsLocationCaptureWidget:public QgsLocationCaptureWidgetBase
@ -35,6 +35,8 @@ class QgsLocationCaptureWidget:public QgsLocationCaptureWidgetBase
public slots: public slots:
void qgsMapCanvas_xyClickCoordinates( QgsPoint & theQgsPoint );
void qgsMapCanvas_xyCoordinates( QgsPoint & theQgsPoint);
private: private:

View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'qgslocationcapturewidgetbase.ui' ** Form implementation generated from reading ui file 'qgslocationcapturewidgetbase.ui'
** **
** Created: Tue Mar 15 01:18:44 2005 ** Created: Wed Mar 16 23:03:37 2005
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -64,6 +64,10 @@ QgsLocationCaptureWidgetBase::QgsLocationCaptureWidgetBase( QWidget* parent, con
languageChange(); languageChange();
resize( QSize(451, 370).expandedTo(minimumSizeHint()) ); resize( QSize(451, 370).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
// signals and slots connections
connect( qgsMapCanvas, SIGNAL( xyClickCoordinates(QgsPoint&) ), this, SLOT( qgsMapCanvas_xyClickCoordinates(QgsPoint&) ) );
connect( qgsMapCanvas, SIGNAL( xyCoordinates(QgsPoint&) ), this, SLOT( qgsMapCanvas_xyCoordinates(QgsPoint&) ) );
} }
/* /*

View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'qgslocationcapturewidgetbase.ui' ** Form interface generated from reading ui file 'qgslocationcapturewidgetbase.ui'
** **
** Created: Tue Mar 15 01:18:44 2005 ** Created: Wed Mar 16 23:03:37 2005
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -12,6 +12,7 @@
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
#include <qgspoint.h>
class QVBoxLayout; class QVBoxLayout;
class QHBoxLayout; class QHBoxLayout;
@ -38,6 +39,10 @@ public:
QLabel* lblCapturePos; QLabel* lblCapturePos;
QLabel* lblCurrentPos; QLabel* lblCurrentPos;
public slots:
virtual void qgsMapCanvas_xyClickCoordinates( QgsPoint & );
virtual void qgsMapCanvas_xyCoordinates( QgsPoint & );
protected: protected:
QGridLayout* QgsLocationCaptureWidgetBaseLayout; QGridLayout* QgsLocationCaptureWidgetBaseLayout;

View File

@ -88,9 +88,27 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<connections>
<connection>
<sender>qgsMapCanvas</sender>
<signal>xyClickCoordinates(QgsPoint&amp;)</signal>
<receiver>QgsLocationCaptureWidgetBase</receiver>
<slot>qgsMapCanvas_xyClickCoordinates(QgsPoint&amp;)</slot>
</connection>
<connection>
<sender>qgsMapCanvas</sender>
<signal>xyCoordinates(QgsPoint&amp;)</signal>
<receiver>QgsLocationCaptureWidgetBase</receiver>
<slot>qgsMapCanvas_xyCoordinates(QgsPoint&amp;)</slot>
</connection>
</connections>
<includes> <includes>
<include location="local" impldecl="in implementation">qgslocationcapturewidgetbase.ui.h</include> <include location="local" impldecl="in implementation">qgslocationcapturewidgetbase.ui.h</include>
</includes> </includes>
<slots>
<slot>qgsMapCanvas_xyClickCoordinates( QgsPoint &amp; )</slot>
<slot>qgsMapCanvas_xyCoordinates( QgsPoint &amp; )</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>qgsmapcanvas.h</includehint> <includehint>qgsmapcanvas.h</includehint>

View File

@ -10,4 +10,16 @@
** destructor. ** destructor.
*****************************************************************************/ *****************************************************************************/
#include <qgspoint.h>
void QgsLocationCaptureWidgetBase::qgsMapCanvas_xyClickCoordinates( QgsPoint & )
{
}
void QgsLocationCaptureWidgetBase::qgsMapCanvas_xyCoordinates( QgsPoint & )
{
}