From 9a5be668c0fc8f6e387dd1e0140467272364f9b0 Mon Sep 17 00:00:00 2001
From: timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Thu, 17 Mar 2005 00:42:44 +0000
Subject: [PATCH] Fix build error caused by incorrect includes.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2981 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 plugins/community_reg_plugin/plugingui.cpp     |  2 ++
 plugins/community_reg_plugin/pluginguibase.cpp |  2 +-
 .../qgslocationcapturewidget.cpp               |  1 +
 .../qgslocationcapturewidget.h                 |  6 ++++--
 .../qgslocationcapturewidgetbase.cpp           |  6 +++++-
 .../qgslocationcapturewidgetbase.h             |  7 ++++++-
 .../qgslocationcapturewidgetbase.ui            | 18 ++++++++++++++++++
 .../qgslocationcapturewidgetbase.ui.h          | 12 ++++++++++++
 8 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/plugins/community_reg_plugin/plugingui.cpp b/plugins/community_reg_plugin/plugingui.cpp
index 61d0a3d0c39..1ceff812211 100644
--- a/plugins/community_reg_plugin/plugingui.cpp
+++ b/plugins/community_reg_plugin/plugingui.cpp
@@ -20,6 +20,7 @@
 #include <qcursor.h> 
 #include <qapplication.h> 
 
+#include <iostream>
 //plugin includes
 #include "qgslocationcapturewidget.h"
 
@@ -72,6 +73,7 @@ void PluginGui::pbnCancel_clicked()
 
 void PluginGui::pbnGetCoords_clicked()
 {
+  std::cout << "Get coords clicked" << std::endl;
   QgsLocationCaptureWidget * myWidget = new QgsLocationCaptureWidget();
   myWidget->show();
   delete myWidget;
diff --git a/plugins/community_reg_plugin/pluginguibase.cpp b/plugins/community_reg_plugin/pluginguibase.cpp
index 82a1fa4e1ed..238c634b46b 100644
--- a/plugins/community_reg_plugin/pluginguibase.cpp
+++ b/plugins/community_reg_plugin/pluginguibase.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidget.cpp b/plugins/community_reg_plugin/qgslocationcapturewidget.cpp
index 9da47a51b34..3ab430545c1 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidget.cpp
+++ b/plugins/community_reg_plugin/qgslocationcapturewidget.cpp
@@ -17,6 +17,7 @@
 
 #include "qgslocationcapturewidget.h"
 #include <qgspoint.h>
+#include <qlabel.h>
 
 QgsLocationCaptureWidget::QgsLocationCaptureWidget( QWidget *parent, const char * name, WFlags f)
            :QgsLocationCaptureWidgetBase( parent, name, f)
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidget.h b/plugins/community_reg_plugin/qgslocationcapturewidget.h
index 60c4444f8a3..2dbff8b1113 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidget.h
+++ b/plugins/community_reg_plugin/qgslocationcapturewidget.h
@@ -17,9 +17,9 @@
 #define QGSLOCATIONCAPTUREWIDGET_H
 
 #ifdef WIN32
-#include "qgslocationcapturewidgetbase.h"
-#else
 #include "qgslocationcapturewidgetbase.uic.h"
+#else
+#include "qgslocationcapturewidgetbase.h"
 #endif
 
 class QgsLocationCaptureWidget:public QgsLocationCaptureWidgetBase
@@ -35,6 +35,8 @@ class QgsLocationCaptureWidget:public QgsLocationCaptureWidgetBase
 
 public slots:
 
+  void qgsMapCanvas_xyClickCoordinates( QgsPoint & theQgsPoint );
+  void qgsMapCanvas_xyCoordinates( QgsPoint & theQgsPoint);
 
 private:
     
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.cpp b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.cpp
index 38e213f696e..d2f16917cf7 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.cpp
+++ b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -64,6 +64,10 @@ QgsLocationCaptureWidgetBase::QgsLocationCaptureWidgetBase( QWidget* parent, con
     languageChange();
     resize( QSize(451, 370).expandedTo(minimumSizeHint()) );
     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&) ) );
 }
 
 /*
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.h b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.h
index a7c24c5b710..6bf9a8217b6 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.h
+++ b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -12,6 +12,7 @@
 
 #include <qvariant.h>
 #include <qwidget.h>
+#include <qgspoint.h>
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -38,6 +39,10 @@ public:
     QLabel* lblCapturePos;
     QLabel* lblCurrentPos;
 
+public slots:
+    virtual void qgsMapCanvas_xyClickCoordinates( QgsPoint & );
+    virtual void qgsMapCanvas_xyCoordinates( QgsPoint & );
+
 protected:
     QGridLayout* QgsLocationCaptureWidgetBaseLayout;
 
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui
index 0f7124acaf7..4a7221f5870 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui
+++ b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui
@@ -88,9 +88,27 @@
         </widget>
     </grid>
 </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>
     <include location="local" impldecl="in implementation">qgslocationcapturewidgetbase.ui.h</include>
 </includes>
+<slots>
+    <slot>qgsMapCanvas_xyClickCoordinates( QgsPoint &amp; )</slot>
+    <slot>qgsMapCanvas_xyCoordinates( QgsPoint &amp; )</slot>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>qgsmapcanvas.h</includehint>
diff --git a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui.h b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui.h
index b1db4839652..9707af7ac0b 100644
--- a/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui.h
+++ b/plugins/community_reg_plugin/qgslocationcapturewidgetbase.ui.h
@@ -10,4 +10,16 @@
 ** destructor.
 *****************************************************************************/
 
+#include <qgspoint.h>
 
+
+void QgsLocationCaptureWidgetBase::qgsMapCanvas_xyClickCoordinates( QgsPoint & )
+{
+
+}
+
+
+void QgsLocationCaptureWidgetBase::qgsMapCanvas_xyCoordinates( QgsPoint & )
+{
+
+}