added libqgis_legend.la where it was needed for compilation

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5277 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 14, 2006 · d43e582 · d43e582
1 parent fe8812c
commit d43e582
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 69 deletions.
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -2416,13 +2416,6 @@ void QgisApp::newVectorLayer()
 
   delete openFileDialog;
 
-
-  // check to see if user specified the extension. if not, add it...
-  //if(filename.find(QRegExp("\\.shp$")) == -1)
-  //{
-  //filename += ".shp";
-  //}
-
   //try to create the new layer with OGRProvider instead of QgsVectorFileWriter
   QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
   QString ogrlib = pReg->library("ogr");
@@ -2469,67 +2462,6 @@ void QgisApp::newVectorLayer()
     }
   }
 
-#if 0
-  //create the new layer with QgsVectorFileWriter
-  QgsVectorFileWriter* writer=0;
-
-  if(geometrytype == QGis::WKBPoint)
-  {
-    writer=new QgsVectorFileWriter(filename,enc,wkbPoint);
-    if(!writer->initialise())
-    {
-      QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
-      return;
-    }
-  }
-  else if(geometrytype == QGis::WKBLineString)
-  {
-    writer=new QgsVectorFileWriter(filename,enc,wkbLineString);
-    if(!writer->initialise())
-    {
-      QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
-      return;
-    }
-  }
-  else if(geometrytype == QGis::WKBPolygon)
-  {
-    writer=new QgsVectorFileWriter(filename,enc,wkbPolygon);
-    if(!writer->initialise())
-    {
-      QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
-      return;
-    }
-  }
-  else
-  {
-#ifdef QGISDEBUG
-    qWarning("QgisApp.cpp: geometry type not recognised");
-#endif
-
-    return;
-  }
-
-  if(writer)
-  {
-    for(std::list<std::pair<QString, QString> >::iterator it=attributes.begin();it!=attributes.end();++it)
-    {
-      if(it->second=="Real")
-      {
-        writer->createField(it->first, OFTReal, 10, 3);
-      }
-      else if(it->second=="Integer")
-      {
-        writer->createField(it->first, OFTInteger, 10, 3);
-      }
-      else if(it->second=="String")
-      {
-        writer->createField(it->first, OFTString, 40, 1);
-      }
-    }
-  }
-  delete writer;
-#endif //0
-
   //then add the layer to the view
   QStringList filelist;
   filelist.append(filename);

diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am
@@ -56,7 +56,8 @@ GLOBALLDADD = $(QT_LDADD) \
 				-lproj \
 				../../../src/core/libqgis_core.la \
 				../../../src/raster/libqgis_raster.la \
-				../../../src/gui/libqgis_gui.la  
+				../../../src/legend/libqgis_legend.la \
+				../../../src/gui/libqgis_gui.la
 GLOBALCXXFLAGS = $(CXXFLAGS) \
 				$(EXTRA_CXXFLAGS) \
 				$(GDAL_CFLAGS) \

diff --git a/tests/src/gui/Makefile.am b/tests/src/gui/Makefile.am
@@ -93,6 +93,7 @@ GLOBALLDADD = $(QT_LDADD) \
 				-lproj \
 				../../../src/core/libqgis_core.la \
 				../../../src/raster/libqgis_raster.la \
+				../../../src/legend/libqgis_legend.la \
 				../../../src/gui/libqgis_gui.la  
 GLOBALCXXFLAGS = $(CXXFLAGS) \
 				$(EXTRA_CXXFLAGS) \

diff --git a/tests/src/raster/Makefile.am b/tests/src/raster/Makefile.am
@@ -20,6 +20,7 @@ GLOBALLDADD = $(QT_LDADD) \
 				-lproj \
 				../../../src/core/libqgis_core.la \
 				../../../src/raster/libqgis_raster.la \
+				../../../src/legend/libqgis_legend.la \
 				../../../src/gui/libqgis_gui.la  
 GLOBALCXXFLAGS = $(CXXFLAGS) \
 				$(EXTRA_CXXFLAGS) \