[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/lib

[Torsten Rahn]

SVN commit 1000409 by rahn:

Fixes by Gridel Thibaut:
- Remove unneeded includes
- Fix compilation warnings



 M  +0 -1      AbstractScanlineTextureMapper.cpp  
 M  +0 -1      EquirectScanlineTextureMapper.cpp  
 M  +2 -0      EquirectScanlineTextureMapper.h  
 M  +0 -3      MarbleAboutDialog.ui  
 M  +0 -1      MarbleControlBox.cpp  
 M  +0 -1      MarbleModel.cpp  
 M  +0 -1      MercatorScanlineTextureMapper.cpp  
 M  +2 -0      MercatorScanlineTextureMapper.h  
 M  +1 -1      PlacemarkInfoDialog.ui  
 M  +0 -4      PositionProviderPluginInterface.cpp  
 M  +0 -1      SphericalScanlineTextureMapper.cpp  
 M  +0 -3      TileCreatorDialog.ui  


--- branches/KDE/4.3/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp #1000408:1000409
@@ -13,7 +13,6 @@
 
 #include <QtCore/QDebug>
 
-#include "GeoPolygon.h"
 #include "GeoSceneTexture.h"
 #include "MarbleDirs.h"
 #include "TextureTile.h"
--- branches/KDE/4.3/kdeedu/marble/src/lib/EquirectScanlineTextureMapper.cpp #1000408:1000409
@@ -20,7 +20,6 @@
 #include <QtGui/QImage>
 
 // Marble
-#include "GeoPolygon.h"
 #include "MarbleDirs.h"
 #include "TextureTile.h"
 #include "TileLoader.h"
--- branches/KDE/4.3/kdeedu/marble/src/lib/EquirectScanlineTextureMapper.h #1000408:1000409
@@ -21,6 +21,8 @@
 
 class EquirectScanlineTextureMapper : public AbstractScanlineTextureMapper
 {
+    Q_OBJECT
+
  public:
     explicit EquirectScanlineTextureMapper( TileLoader *tileLoader,
 					    QObject    *parent = 0 );
--- branches/KDE/4.3/kdeedu/marble/src/lib/MarbleAboutDialog.ui #1000408:1000409
@@ -24,9 +24,6 @@
      <property name="text" >
       <string/>
      </property>
-     <property name="pixmap" >
-      <pixmap/>
-     </property>
     </widget>
    </item>
    <item>
--- branches/KDE/4.3/kdeedu/marble/src/lib/MarbleControlBox.cpp #1000408:1000409
@@ -33,7 +33,6 @@
 #include <QtCore/QTimer>
 #include <QtGui/QSortFilterProxyModel>
 #include <QtGui/QStandardItemModel>
-#include <QtGui/QStandardItemModel>
 #include <QtGui/QTextFrame>
 
 #include <global.h>
--- branches/KDE/4.3/kdeedu/marble/src/lib/MarbleModel.cpp #1000408:1000409
@@ -45,7 +45,6 @@
 #include "SphericalScanlineTextureMapper.h"
 #include "EquirectScanlineTextureMapper.h"
 #include "MercatorScanlineTextureMapper.h"
-#include "GeoPolygon.h"
 #include "gps/GpxFileModel.h"
 #include "HttpDownloadManager.h"
 #include "KmlFileViewItem.h"
--- branches/KDE/4.3/kdeedu/marble/src/lib/MercatorScanlineTextureMapper.cpp #1000408:1000409
@@ -21,7 +21,6 @@
 #include <QtGui/QImage>
 
 // Marble
-#include "GeoPolygon.h"
 #include "MarbleDirs.h"
 #include "TextureTile.h"
 #include "TileLoader.h"
--- branches/KDE/4.3/kdeedu/marble/src/lib/MercatorScanlineTextureMapper.h #1000408:1000409
@@ -21,6 +21,8 @@
 
 class MercatorScanlineTextureMapper : public AbstractScanlineTextureMapper
 {
+    Q_OBJECT
+
  public:
     explicit MercatorScanlineTextureMapper( TileLoader *tileLoader,
 					    QObject    *parent = 0 );
--- branches/KDE/4.3/kdeedu/marble/src/lib/PlacemarkInfoDialog.ui #1000408:1000409
@@ -235,7 +235,7 @@
         </spacer>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout">
+        <layout class="QGridLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="elevation_lbl">
            <property name="text">
--- branches/KDE/4.3/kdeedu/marble/src/lib/PositionProviderPluginInterface.cpp #1000408:1000409
@@ -13,7 +13,3 @@
 
 
 Marble::PositionProviderPluginInterface::~PositionProviderPluginInterface() {}
-
-
-
-#include "PositionProviderPluginInterface.moc"
--- branches/KDE/4.3/kdeedu/marble/src/lib/SphericalScanlineTextureMapper.cpp #1000408:1000409
@@ -17,7 +17,6 @@
 #include <QtGui/QImage>
 
 #include "global.h"
-#include "GeoPolygon.h"
 #include "MarbleDirs.h"
 #include "Quaternion.h"
 #include "TextureTile.h"
--- branches/KDE/4.3/kdeedu/marble/src/lib/TileCreatorDialog.ui #1000408:1000409
@@ -18,9 +18,6 @@
   <property name="windowTitle" >
    <string>Creating Map</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <layout class="QVBoxLayout" >
    <property name="spacing" >
     <number>6</number>