[Marble-commits] KDE/kdeedu/marble/src

[Jens-Michael Hoffmann]

SVN commit 1077302 by jmhoffmann:

Marble depends on Qt >= 4.5, so remove corresponding checks and compatibility code for previous versions in the source.

 M  +0 -7      lib/LayerManager.cpp  
 M  +0 -4      plugins/render/photo/FlickrParser.cpp  
 M  +0 -2      qtmain.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/LayerManager.cpp #1077301:1077302
@@ -109,14 +109,7 @@
     QList<AbstractDataPluginItem *> itemList;
     
     foreach( AbstractDataPlugin *plugin, d->m_dataPlugins ) {
-#if QT_VERSION >= 0x040500
         itemList.append( plugin->whichItemAt( curpos ) );
-#else
-        QList<AbstractDataPluginItem *> subList =  plugin->whichItemAt( curpos );
-        foreach( AbstractDataPluginItem *item, subList ) {
-            itemList.append( item );
-        }
-#endif
     }
     return itemList;
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/photo/FlickrParser.cpp #1077301:1077302
@@ -109,11 +109,7 @@
     Q_ASSERT( isStartElement()
               && name() == "photo" );
               
-#if QT_VERSION >= 0x040500
         if( attributes().hasAttribute( "id" ) ) {
-#else
-        if( attributes().value( "id" ).isEmpty() ) {
-#endif
         PhotoPluginItem *item = new PhotoPluginItem( m_parent );
         item->setId( attributes().value( "id" ).toString() );
         item->setServer( attributes().value( "server" ).toString() );
--- trunk/KDE/kdeedu/marble/src/qtmain.cpp #1077301:1077302
@@ -37,7 +37,6 @@
  
 int main(int argc, char *argv[])
 {
-#if QT_VERSION >= 0x040500
     // The GraphicsSystem needs to be set before the instantiation of the
     // QApplication. Therefore we need to parse the current setting 
     // in this unusual place :-/
@@ -45,7 +44,6 @@
     QString graphicsString = graphicsSettings->value("View/graphicsSystem", "native").toString();
     delete graphicsSettings;
     QApplication::setGraphicsSystem( graphicsString );
-#endif
 
     QApplication app(argc, argv);
     // Widget translation